From 51ba2ff551e0f030b9e5201c85447baf981e9754 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Mon, 20 Oct 2014 09:58:25 -0600 Subject: [PATCH] Better error handling in list_locks() Signed-off-by: Zack Cerza --- teuthology/lock.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/teuthology/lock.py b/teuthology/lock.py index b005520942..aebbd04407 100644 --- a/teuthology/lock.py +++ b/teuthology/lock.py @@ -449,6 +449,7 @@ def list_locks(keyed_by_name=False, **kwargs): response = requests.get(uri) except requests.ConnectionError: success = False + log.exception("Could not contact lock server: %s", config.lock_server) else: success = response.ok if success: @@ -457,7 +458,7 @@ def list_locks(keyed_by_name=False, **kwargs): else: return {node['name']: node for node in response.json()} - return None + return dict() def update_lock(name, description=None, status=None, ssh_pub_key=None): -- 2.39.5