From 0b72acc7c8f799d31c65c8d32042438d7c57dea7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannes=20H=C3=B6ke?= <jhoeke@uni-bremen.de>
Date: Mon, 23 Nov 2015 03:45:47 +0100
Subject: [PATCH] handle SIGINT, SIGTERM and SIGABRT

---
 telegram/updater.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/telegram/updater.py b/telegram/updater.py
index ee302e234..4679863ba 100644
--- a/telegram/updater.py
+++ b/telegram/updater.py
@@ -9,8 +9,8 @@ import os
 import ssl
 from threading import Thread
 from time import sleep
-
 import subprocess
+from signal import signal, SIGINT, SIGTERM, SIGABRT
 
 from telegram import (Bot, TelegramError, dispatcher, Dispatcher,
                       NullHandler)
@@ -58,6 +58,7 @@ class Updater:
         self.last_update_id = 0
         self.logger = logging.getLogger(__name__)
         self.running = False
+        self.is_idle = False
         self.httpd = None
 
     def start_polling(self, poll_interval=1.0, timeout=10, network_delay=2):
@@ -229,11 +230,17 @@ class Updater:
 
         self.logger.debug("Dispatcher stopped.")
 
+    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 """
-        while True:
-            try:
-                sleep(1)
-            except KeyboardInterrupt:
-                self.stop()
-                break
+        signal(SIGINT, self.signal_handler)
+        signal(SIGTERM, self.signal_handler)
+        signal(SIGABRT, self.signal_handler)
+
+        self.is_idle = True
+
+        while self.is_idle:
+            sleep(1)