diff options
| author | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-10-29 13:30:37 +0000 |
|---|---|---|
| committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2014-10-29 13:30:37 +0000 |
| commit | ee0fb3e914393d51a4e09341a52a597deb27e17c (patch) | |
| tree | fe9e66a3828202cc80b741a7dd7cc3c21b32b144 | |
| parent | ed9de1ececb9bea73ac7d4ad91b7c56588698005 (diff) | |
jenkins_lava_helper: fixed error handling
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>
| -rw-r--r-- | helpers/jenkins_lava.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/helpers/jenkins_lava.py b/helpers/jenkins_lava.py index 6c9138a..2e43139 100644 --- a/helpers/jenkins_lava.py +++ b/helpers/jenkins_lava.py @@ -127,7 +127,7 @@ def fetch_jenkins_builds(jenkins_db_job, jenkins_job, jenkins_build): log.debug("Jenkins build description: {0}".format(build._data['description'])) for r in lava_job_regexp.finditer(build._data['description']): get_lava_job_details(r.group('lava_job_id'), db_run, lava_server) - except ConnectionError: + except: log.error("ConnectionError occured. Probably timeout") log.error(traceback.print_exc()) build_status, created = JenkinsBuildStatus.objects.get_or_create(name = ERROR) @@ -146,8 +146,13 @@ def get_lava_job_details(job_id, jenkins_build, lava_server=None): try: job_details = lava_server.call_xmlrpc("scheduler.job_details", job_id) except LavaServerException: + log.error("Lava Server Connection Problem") return False, "Lava Server Connection Problem" - + except xmlrpclib.Fault: + log.error("Lava Internal Server Error") + return False, "Lava Internal Server Error" + + db_device = None if 'requested_device_type_id' in job_details and job_details['requested_device_type_id']: db_device, created = Device.objects.get_or_create( |