diff options
| author | Frederick Muriuki Muriithi | 2026-01-13 10:34:40 -0600 |
|---|---|---|
| committer | Frederick Muriuki Muriithi | 2026-01-13 10:34:40 -0600 |
| commit | a8ca22665200622148b29f19d92bf4076f7a3903 (patch) | |
| tree | ec5bf99a77e8298074cae1d91371c7c13d882228 | |
| parent | 0c9442ada06e4d02635f62596f5563be91c46f00 (diff) | |
| download | gn-uploader-a8ca22665200622148b29f19d92bf4076f7a3903.tar.gz | |
Use one default handler for both error and success conditions.
| -rw-r--r-- | uploader/background_jobs.py | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/uploader/background_jobs.py b/uploader/background_jobs.py index fa8eb65..a71dd44 100644 --- a/uploader/background_jobs.py +++ b/uploader/background_jobs.py @@ -36,14 +36,16 @@ def make_datetime_formatter(dtformat: str = "%A, %d %B %Y at %H:%M %Z") -> Calla __default_datetime_formatter__ = make_datetime_formatter() -def __default_error_handler__(job: dict) -> Response: - return redirect(url_for("background-jobs.job_summary", job_id=job["job_id"])) +def __default_handler__(_job): + return render_template("background-jobs/job-summary.html", + job=_job, + display_datetime=__default_datetime_formatter__) def register_handlers( job_type: str, success_handler: HandlerType, # pylint: disable=[redefined-outer-name] - error_handler: HandlerType = __default_error_handler__ + error_handler: HandlerType = __default_handler__ # pylint: disable=[redefined-outer-name] ) -> str: """Register success and error handlers for each job type.""" @@ -75,7 +77,7 @@ def register_job_handlers(job: dict): try: _error_handler = __load_handler__(metadata["error_handler"]) except Exception as _exc:# pylint: disable=[broad-exception-caught] - _error_handler = __default_error_handler__ + _error_handler = __default_handler__ register_handlers( metadata["job-type"], _success_handler, _error_handler) @@ -91,12 +93,7 @@ def handler(job: dict, handler_type: str) -> HandlerType: if bool(_handler): return _handler(job) - def __default_success_handler__(_job): - return render_template("background-jobs/job-summary.html", - job=_job, - display_datetime=__default_datetime_formatter__) - - return __default_success_handler__(job) + return __default_handler__(job) error_handler = partial(handler, handler_type="error") |
