3535@receiver (post_execute )
3636def detect_timeout (sender , task , ** kwargs ):
3737 """Detect scan task timeout."""
38- if 'Task exceeded maximum timeout' in task ['result' ]:
38+ result = task .get ('result' )
39+ if isinstance (result , str ) and 'Task exceeded maximum timeout' in result :
3940 task_id = task ['id' ]
4041 EnqueuedTask .objects .filter (task_id = task_id ).update (
4142 app_name = 'Failed' ,
@@ -45,7 +46,7 @@ def detect_timeout(sender, task, **kwargs):
4546 logger .error ('Task %s exceeded maximum timeout' , task_id )
4647
4748
48- def async_analysis (checksum , app_name , func , * args ):
49+ def async_analysis (checksum , api , file_name , func , * args , ** kwargs ):
4950 """Async Analysis Task."""
5051 # Check if the task is already completed
5152 recent = RecentScansDB .objects .filter (MD5 = checksum )
@@ -62,11 +63,17 @@ def async_analysis(checksum, app_name, func, *args):
6263 if queued_recently :
6364 if scan_completed :
6465 # scan already completed recently
65- logger .warning ('Analysis already completed in the last 60 minutes' )
66+ msg = 'Analysis already completed in the last 60 minutes'
67+ logger .warning (msg )
68+ if api :
69+ return {'task_id' : None , 'message' : msg }
6670 return HttpResponseRedirect ('/tasks?q=completed' )
6771 elif active_recently :
6872 # scan not completed but active recently
69- logger .warning ('Analysis already enqueued in the last 60 minutes' )
73+ msg = 'Analysis already enqueued in the last 60 minutes'
74+ logger .warning (msg )
75+ if api :
76+ return {'task_id' : None , 'message' : msg }
7077 return HttpResponseRedirect ('/tasks?q=queued' )
7178
7279 # Clear old tasks
@@ -80,6 +87,7 @@ def async_analysis(checksum, app_name, func, *args):
8087 .values_list ('id' , flat = True )[:task_count - queue_size ])
8188 # Delete tasks by IDs
8289 EnqueuedTask .objects .filter (id__in = oldest_task_ids ).delete ()
90+
8391 # Enqueue the task
8492 task_id = async_task (
8593 func ,
@@ -89,10 +97,12 @@ def async_analysis(checksum, app_name, func, *args):
8997 EnqueuedTask .objects .create (
9098 task_id = task_id ,
9199 checksum = checksum ,
92- file_name = app_name [:254 ])
100+ file_name = file_name [:254 ])
93101 msg = f'Scan Queued with ID: { task_id }
94102 logger .info (msg )
95103 append_scan_status (checksum , msg )
104+ if api :
105+ return {'task_id' : task_id , 'message' : msg }
96106 return HttpResponseRedirect ('/tasks' )
97107
98108
@@ -118,7 +128,7 @@ def get_live_status(enq):
118128
119129@login_required
120130@require_http_methods (['POST' , 'GET' ])
121- def list_tasks (request ):
131+ def list_tasks (request , api = False ):
122132 if request .method == 'POST' :
123133 enqueued = EnqueuedTask .objects .all ().order_by ('-created_at' )
124134 task_data = []
@@ -133,6 +143,8 @@ def list_tasks(request):
133143 'completed_at' : enq .completed_at ,
134144 'status' : get_live_status (enq ),
135145 })
146+ if api :
147+ return task_data
136148 return JsonResponse (task_data , safe = False )
137149 context = {
138150 'title' : 'Scan Tasks' ,
0 commit comments