Skip to content
Snippets Groups Projects
Commit 2f0cf175 authored by Eva Bardou's avatar Eva Bardou :frog: Committed by Yoann Schneider
Browse files

Log a message when everything went well as well

parent d5ad952d
No related branches found
No related tags found
1 merge request!504Log a message when everything went well as well
Pipeline #162742 passed
......@@ -230,12 +230,13 @@ class ElementsWorker(
with contextlib.suppress(Exception):
self.update_activity(element.id, ActivityState.Error)
message = f'Ran on {count} element{"s"[:count>1]}: {count - failed} completed, {failed} failed'
if failed:
logger.error(
f"Ran on {count} elements: {count - failed} completed, {failed} failed"
)
logger.error(message)
if failed >= count: # Everything failed!
sys.exit(1)
else:
logger.info(message)
def process_element(self, element: Element | CachedElement):
"""
......@@ -505,9 +506,10 @@ class DatasetWorker(BaseWorker, DatasetMixin, TaskMixin):
if dataset_artifact:
dataset_artifact.unlink(missing_ok=True)
message = f'Ran on {count} dataset{"s"[:count>1]}: {count - failed} completed, {failed} failed'
if failed:
logger.error(
f"Ran on {count} datasets: {count - failed} completed, {failed} failed"
)
logger.error(message)
if failed >= count: # Everything failed!
sys.exit(1)
else:
logger.info(message)
......@@ -512,7 +512,7 @@ def test_run_initial_dataset_state_error(
if generator
else []
) + [
(logging.ERROR, "Ran on 1 datasets: 0 completed, 1 failed"),
(logging.ERROR, "Ran on 1 dataset: 0 completed, 1 failed"),
]
......@@ -577,7 +577,7 @@ def test_run_update_dataset_state_api_error(
],
(
logging.ERROR,
"Ran on 1 datasets: 0 completed, 1 failed",
"Ran on 1 dataset: 0 completed, 1 failed",
),
]
......@@ -639,7 +639,7 @@ def test_run_download_dataset_artifact_api_error(
),
(
logging.ERROR,
"Ran on 1 datasets: 0 completed, 1 failed",
"Ran on 1 dataset: 0 completed, 1 failed",
),
]
......@@ -690,7 +690,7 @@ def test_run_no_downloaded_artifact_error(
),
(
logging.ERROR,
"Ran on 1 datasets: 0 completed, 1 failed",
"Ran on 1 dataset: 0 completed, 1 failed",
),
]
......@@ -792,7 +792,9 @@ def test_run(
assert [(level, message) for _, level, message in caplog.record_tuples] == [
(logging.INFO, "Loaded Worker Fake worker @ 123412 from API"),
(logging.INFO, "Processing Dataset (dataset_id) (1/1)"),
] + extra_logs
*extra_logs,
(logging.INFO, "Ran on 1 dataset: 1 completed, 0 failed"),
]
@pytest.mark.parametrize(
......@@ -890,4 +892,6 @@ def test_run_read_only(
assert [(level, message) for _, level, message in caplog.record_tuples] == [
(logging.WARNING, "Running without any extra configuration"),
(logging.INFO, "Processing Dataset (dataset_id) (1/1)"),
] + extra_logs
*extra_logs,
(logging.INFO, "Ran on 1 dataset: 1 completed, 0 failed"),
]
......@@ -310,7 +310,7 @@ def test_start_activity_error(
),
]
assert logger.error.call_args_list == [
mocker.call("Ran on 1 elements: 0 completed, 1 failed")
mocker.call("Ran on 1 element: 0 completed, 1 failed")
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment