Skip to content
Snippets Groups Projects
Commit eb8e5e6b authored by Klaas Kliffen's avatar Klaas Kliffen :satellite:
Browse files

Merge branch 'hotfix/add_logging' into 'main'

Hotfix/add logging

See merge request !31
parents 5c41bcd1 9985d145
Branches
Tags
1 merge request!31Hotfix/add logging
Pipeline #40762 passed
...@@ -156,7 +156,13 @@ def insert_task_into_atdb(workspecification_id: int): ...@@ -156,7 +156,13 @@ def insert_task_into_atdb(workspecification_id: int):
pk=workspecification_id pk=workspecification_id
) )
inputs: Dict[str, Any] = work_spec.inputs.copy() inputs: Dict[str, Any] = work_spec.inputs.copy()
try:
entries: List[dict] = inputs.pop("surls") entries: List[dict] = inputs.pop("surls")
except IndexError:
logger.error("Work specification does not contain any surls. This should never happen")
raise RequestNotOk
batches = split_entries_to_batches(entries, work_spec.batch_size) batches = split_entries_to_batches(entries, work_spec.batch_size)
...@@ -189,6 +195,7 @@ def insert_task_into_atdb(workspecification_id: int): ...@@ -189,6 +195,7 @@ def insert_task_into_atdb(workspecification_id: int):
res = sess.post(url, json=payload, auth=TokenAuth(site.access_token)) res = sess.post(url, json=payload, auth=TokenAuth(site.access_token))
if not res.ok: if not res.ok:
logger.error("Request not ok: {}".format(res.text))
raise RequestNotOk() raise RequestNotOk()
# Store ATDB Task ID in related_tasks # Store ATDB Task ID in related_tasks
...@@ -202,7 +209,8 @@ def insert_task_into_atdb(workspecification_id: int): ...@@ -202,7 +209,8 @@ def insert_task_into_atdb(workspecification_id: int):
work_spec.submission_status = SUBMISSION_STATUS.DEFINING work_spec.submission_status = SUBMISSION_STATUS.DEFINING
if work_spec.is_auto_submit: if work_spec.is_auto_submit:
set_tasks_defined.delay(workspecification_id) set_tasks_defined.delay(workspecification_id)
except (RequestException, RequestNotOk): except (RequestException, RequestNotOk) as err:
logger.error(err)
work_spec.submission_status = SUBMISSION_STATUS.ERROR work_spec.submission_status = SUBMISSION_STATUS.ERROR
finally: finally:
work_spec.save() work_spec.save()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment