From ad012469d17bd3b7fab70fdfa4ca552ded0a982e Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 12 May 2014 09:11:04 -0500 Subject: [PATCH] Move list of exceptions to catch Signed-off-by: Zack Cerza --- teuthology/report.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/teuthology/report.py b/teuthology/report.py index 9a80840dc2ef5..7db51209d1537 100644 --- a/teuthology/report.py +++ b/teuthology/report.py @@ -10,6 +10,8 @@ from datetime import datetime import teuthology from .config import config +report_exceptions = (requests.exceptions.RequestException, socket.error) + def init_logging(): """ @@ -433,7 +435,7 @@ def try_push_job_info(job_config, extra_info=None): log.debug("Pushing job info to %s", config.results_server) push_job_info(run_name, job_id, job_info) return - except (requests.exceptions.RequestException, socket.error): + except report_exceptions: log.exception("Could not report results to %s", config.results_server) @@ -468,14 +470,14 @@ def try_delete_jobs(run_name, job_ids, delete_empty_run=True): try: reporter.delete_run(run_name) return - except (requests.exceptions.RequestException, socket.error): + except report_exceptions: log.exception("Run deletion failed") def try_delete_job(job_id): try: reporter.delete_job(run_name, job_id) return - except (requests.exceptions.RequestException, socket.error): + except report_exceptions: log.exception("Job deletion failed") for job_id in job_ids: -- 2.39.5