Skip to content

Commit

Permalink
Added logging for websocket upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
miguelgrinberg committed Jul 13, 2015
1 parent 583736a commit 4b5ceca
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions engineio/socket.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ def handle_get_request(self, environ, start_response):
connections = environ.get('HTTP_CONNECTION', '').lower().split(',')
transport = environ.get('HTTP_UPGRADE', '').lower()
if 'upgrade' in connections and transport in self.upgrade_protocols:
self.server.logger.info('%s: Received request to upgrade to %s',
self.sid, transport)
return getattr(self, '_upgrade_' + transport)(environ,
start_response)
try:
Expand Down Expand Up @@ -100,6 +102,8 @@ def _websocket_handler(self, ws):
if pkt != packet.Packet(packet.PING,
data=six.text_type('probe')).encode(
always_bytes=False):
self.server.logger.info(
'%s: Failed websocket upgrade, no PING packet', self.sid)
return
ws.send(packet.Packet(packet.PONG, data=six.text_type('probe')).encode(
always_bytes=False))
Expand All @@ -110,6 +114,8 @@ def _websocket_handler(self, ws):
pkt = ws.wait()
if pkt != packet.Packet(packet.UPGRADE).encode(always_bytes=False):
self.upgraded = False
self.server.logger.info(
'%s: Failed websocket upgrade, no UPGRADE packet', self.sid)
return

def writer():
Expand All @@ -123,6 +129,9 @@ def writer():

writer_task = eventlet.spawn(writer)

self.server.logger.info(
'%s: Upgrade to websocket succesful', self.sid)

while True:
p = ws.wait()
if p is None:
Expand Down

0 comments on commit 4b5ceca

Please sign in to comment.