OpenSource/python-telegram-bot
OpenSource/python-telegram-bot
1
0
Fork 0
mirror of https://github.com/python-telegram-bot/python-telegram-bot.git synced 2025-01-18 15:20:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve logging

Browse source
This commit is contained in:
Jannes Höke 2015-11-21 23:09:19 +01:00
parent 6a80a33aef
commit fca8aee177
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
telegram/boteventhandler.py
View file

@ -207,7 +207,6 @@ class BotEventHandler:
'Send a Telegram message to the bot to exit immediately.')
self.httpd.shutdown()
self.httpd = None
self.logger.debug("Webhook-HTTPServer closed.")
self.logger.debug("Requesting Broadcaster to stop...")
self.broadcaster.stop()

9
telegram/utils/webhookhandler.py
View file

@ -18,13 +18,16 @@ class WebhookServer(BaseHTTPServer.HTTPServer, object):
webhook_path):
super(WebhookServer, self).__init__(server_address,
RequestHandlerClass)
self.logger = logging.getLogger(__name__)
self.update_queue = update_queue
self.webhook_path = webhook_path
self.is_running = False
def serve_forever(self, poll_interval=0.5):
self.is_running = True
self.logger.info("Webhook Server started.")
super(WebhookServer, self).serve_forever(poll_interval)
self.logger.info("Webhook Server stopped.")
def shutdown(self):
if not self.is_running:
@ -40,6 +43,7 @@ class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
server_version = "WebhookHandler/1.0"
def __init__(self, request, client_address, server):
self.logger = logging.getLogger(__name__)
super(WebhookHandler, self).__init__(request, client_address, server)
def do_HEAD(self):
@ -51,6 +55,7 @@ class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
self.end_headers()
def do_POST(self):
self.logger.debug("Webhook triggered")
if self.path == self.server.webhook_path and \
'content-type' in self.headers and \
'content-length' in self.headers and \
@ -61,7 +66,11 @@ class WebhookHandler(BaseHTTPServer.BaseHTTPRequestHandler, object):
self.send_response(200)
self.end_headers()
self.logger.debug("Webhook received data: " + json_string)
update = Update.de_json(json.loads(json_string))
self.logger.info("Received Update with ID %d on Webhook" %
update.update_id)
self.server.update_queue.put(update)
else: