Merge branch 'Tengah-master'

This commit is contained in:
Jannes Höke 2015-12-31 15:41:53 +01:00
commit 97ebebefc1

View file

@ -25,7 +25,6 @@ from functools import wraps
from inspect import getargspec from inspect import getargspec
from threading import Thread, BoundedSemaphore, Lock from threading import Thread, BoundedSemaphore, Lock
from re import match from re import match
from traceback import print_exc
from telegram import (TelegramError, Update, NullHandler) from telegram import (TelegramError, Update, NullHandler)
@ -188,7 +187,7 @@ class Dispatcher:
# All other errors should not stop the thread, just print them # All other errors should not stop the thread, just print them
except: except:
print_exc() self.logger.exception()
else: else:
self.__lock.release() self.__lock.release()
self.logger.info('Dispatcher thread stopped') self.logger.info('Dispatcher thread stopped')