summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorAleš Smodiš <aless@guru.si>2015-09-15 10:46:10 +0200
committerAleš Smodiš <aless@guru.si>2015-09-15 10:46:10 +0200
commit64073d4c7efb2f21f66d0fea5083c659a1b0a15e (patch)
tree45b778a32cf2e15ff8edd8ea23efc13176d98ca2 /server
parenta49a44fc4b06f2675de3a4f7cbc9ac4e477f1c28 (diff)
Augmented the readme with apache directives for proxying websocket directives.
Diffstat (limited to 'server')
-rw-r--r--server/socket.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/socket.py b/server/socket.py
index c248056..b184d4b 100644
--- a/server/socket.py
+++ b/server/socket.py
@@ -20,8 +20,10 @@ _transactions_to_socket = {} # keyed by tid, used only when there is no sid ava
def processIncomingPacket(receiving_socket, packet):
print('Decocoding JSON: {}'.format(packet))
obj = json.loads(packet)
- if obj.get('type') == 'connect':
+ req_type = obj.get('type') # private (meta) requests have the 'type'
+ if req_type == 'connect':
return # TODO: first packet is 'connect', providing the list of connected sessions to the peer
+
tid = obj.get('tid') # transaction ID
if tid is None:
raise Exception('Transaction ID is missing from the request')
@@ -270,7 +272,7 @@ class Communication(SocketHandler):
lock.release()
for handler in handlers:
handler.destroy() # destroy them all, even the server socket
- # this is where everything is destroyed but us, so what follows is self-destruct
+ # this is where everything has been destroyed but us, so what follows is self-destruct
lock.acquire()
try:
self._destroying = True