From: Zack Cerza <zack@cerza.org>
Date: Tue, 25 Mar 2014 20:40:56 +0000 (-0500)
Subject: Exit gracefully on KeyboardInterrupt
X-Git-Tag: 1.1.0~1566
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3d0c19f5fad9453ca297dd442559c0af8833249;p=teuthology.git

Exit gracefully on KeyboardInterrupt

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/beanstalk.py b/teuthology/beanstalk.py
index bcc4ceb28..d76d914f5 100644
--- a/teuthology/beanstalk.py
+++ b/teuthology/beanstalk.py
@@ -65,6 +65,10 @@ def main(args):
     machine_type = args['--machine_type']
     delete = args['--delete']
     show_desc = args['--description']
-    beanstalk = beanstalk_connect(machine_type)
-    walk_jobs(beanstalk, machine_type, show_desc=show_desc, delete=delete)
-    beanstalk.close()
+    try:
+        beanstalk = beanstalk_connect(machine_type)
+        walk_jobs(beanstalk, machine_type, show_desc=show_desc, delete=delete)
+    except KeyboardInterrupt:
+        log.info("Interrupted.")
+    finally:
+        beanstalk.close()