HTML Escaped error messages for better security, fixed bug related to callable only task
This commit is contained in:
parent
21dc3f034e
commit
155dac5fe8
|
|
@ -14,11 +14,12 @@ class BaseModelAdmin( admin.ModelAdmin ):
|
|||
if request.user.is_superuser:
|
||||
traceback_message = ''.join(traceback.TracebackException.from_exception(e).format())
|
||||
self.message_user( request, mark_safe(f"""
|
||||
Error For <b>{id}</b>: {e}
|
||||
Error For <b>{id}</b>:
|
||||
<style>
|
||||
pre.tb {{display: none;}}
|
||||
a.tb:focus + pre.tb {{display: block;}}
|
||||
</style>
|
||||
<pre>{escape(e)}</pre>
|
||||
<a class='tb' href='#'>[TraceBack]</a>
|
||||
<pre class='tb'>{escape(traceback_message)}</pre>
|
||||
"""), messages.ERROR
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ class Trace( BaseModel ):
|
|||
assert self.status in "SAE", f"Cannot reschedule a task that is in {self.get_status_display()} state!"
|
||||
|
||||
await self.eval_related('task')
|
||||
assert self.task.interval, "This is not a periodic task! Nothing to reschedule."
|
||||
assert self.task.interval or target_datetime, "This is not a periodic task! Nothing to reschedule."
|
||||
|
||||
self.set_status( "S", reason )
|
||||
if target_datetime:
|
||||
|
|
|
|||
|
|
@ -362,7 +362,7 @@ class AsyncronWorker:
|
|||
from .models import Task, Trace
|
||||
|
||||
#start services that aren't running yet.
|
||||
Ts = Task.objects.filter( interval = None ).exclude(
|
||||
Ts = Task.objects.filter( interval = None, timeout = None ).exclude(
|
||||
trace__status__in = "WR"
|
||||
).exclude( worker_type = "D" if self.model.is_robust else "R" )
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user