diff --git a/maap_utils/Job.py b/maap_utils/Job.py index bbf5dcaf0a0d036ff2b5d1c484b8e19a9d5c8692..5fa314dd70ce05a756039a3e34916406b9986cab 100644 --- a/maap_utils/Job.py +++ b/maap_utils/Job.py @@ -31,6 +31,8 @@ class Job: """Call a MAAP function, catch and log exceptions.""" try: return fn(*args, **kwargs) + except KeyboardInterrupt: + raise except Exception as e: logging.error(f"MAAP API error in {fn.__name__}: {e}") return None diff --git a/maap_utils/JobManager.py b/maap_utils/JobManager.py index 460778a497080929c6222f0dcb2fbb544682b91f..4c07e7082238dd5d4a1472826d7949632d53d52c 100644 --- a/maap_utils/JobManager.py +++ b/maap_utils/JobManager.py @@ -54,6 +54,8 @@ class JobManager: job.submit() self.ledger.add_job(job) job_batch_counter += 1 + except KeyboardInterrupt: + raise except Exception as e: logging.error(f"Error submitting job: {e}") continue