Merge pull request brad-sp#289 from keithjjones/fix-api

Fixed remote submissions
feliperalmeida · Sep 19, 2016 · 16c7280 · 16c7280
2 parents 9a2ca79 + 7ac698a
commit 16c7280
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/utils/api.py b/utils/api.py
@@ -86,10 +86,10 @@ def tasks_create_file():
     shrike_sid = request.forms.get("shrike_sid", None)
     shrike_refer = request.forms.get("shrike_refer", None)
 
-    if int(memory):
+    if memory:
         memory = True
     enforce_timeout = request.forms.get("enforce_timeout", False)
-    if int(enforce_timeout):
+    if enforce_timeout:
         enforce_timeout = True
 
     temp_file_path = store_temp_file(data.file.read(), data.filename)

diff --git a/utils/submit.py b/utils/submit.py
@@ -250,7 +250,8 @@ def main():
                     return False
 
                 json = response.json()
-                task_ids = [ json["task_id"] ]
+                task_ids = [ json.get("task_ids",None) ]
+
             else:
                 if args.unique:
                     sha256 = File(file_path).get_sha256()