Catch KeyboardInterrupt exceptions and stop processes gracefully when…

… catched
dnaeon · Sep 3, 2014 · c0a0694 · c0a0694
1 parent 2b0b5b2
commit c0a0694
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/vpoller/proxy.py b/src/vpoller/proxy.py
@@ -79,7 +79,10 @@ def start(self):
 
         logging.info('Proxy Manager is ready and running')
         while not self.time_to_die.is_set():
-            self.wait_for_mgmt_task()
+            try:
+                self.wait_for_mgmt_task()
+            except KeyboardInterrupt:
+                self.signal_stop()
 
         self.stop()
 
@@ -279,7 +282,10 @@ def run(self):
 
         logging.info('Proxy process is ready and running')
         while not self.time_to_die.is_set():
-            self.distribute_tasks()
+            try:
+                self.distribute_tasks()
+            except KeyboardInterrupt:
+                self.signal_stop()
 
         self.stop()
 

diff --git a/src/vpoller/worker.py b/src/vpoller/worker.py
@@ -85,7 +85,10 @@ def start(self):
 
         logging.info('Worker Manager is ready and running')
         while not self.time_to_die.is_set():
-            self.wait_for_mgmt_task()
+            try:
+                self.wait_for_mgmt_task()
+            except KeyboardInterrupt:
+                self.signal_stop()
 
         self.stop()
 
@@ -307,7 +310,10 @@ def run(self):
 
         logging.info('Worker process is ready and running')
         while not self.time_to_die.is_set():
-            self.wait_for_tasks()
+            try:
+                self.wait_for_tasks()
+            except KeyboardInterrupt:
+                self.signal_stop()
 
         self.stop()