saintbyte
diff --git a/‎examples/eventhandler_simplebot.py‎
Lines changed: 2 additions & 1 deletion b/‎examples/eventhandler_simplebot.py‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎telegram/updater.py‎
Lines changed: 11 additions & 5 deletions b/‎telegram/updater.py‎
Lines changed: 11 additions & 5 deletions
@@ -67,7 +67,8 @@ def main():
     # Start the Bot
     updater.start_polling(timeout=5)
 
-    # Run the bot until the user presses Ctrl-C
+    # Run the bot until the user presses Ctrl-C or the process receives SIGINT,
+    # SIGTERM or SIGABRT
     updater.idle()
 
 if __name__ == '__main__':
 
@@ -234,11 +234,17 @@ def signal_handler(self, signum, frame):
         self.is_idle = False
         self.stop()
 
-    def idle(self):
-        """ Waits for the user to press Ctrl-C and stops the updater """
-        signal(SIGINT, self.signal_handler)
-        signal(SIGTERM, self.signal_handler)
-        signal(SIGABRT, self.signal_handler)
+    def idle(self, stop_signals=(SIGINT, SIGTERM, SIGABRT)):
+        """
+        Waits for the user to press Ctrl-C and stops the updater
+
+        Args:
+            stop_signals: Iterable containing signals from the signal module
+                that should be subscribed to. Updater.stop() will be called on
+                receiving one of those signals.
+        """
+        for sig in stop_signals:
+            signal(sig, self.signal_handler)
 
         self.is_idle = True