Fixed building of websocket

jacek-marchwicki · jacek-marchwicki · commit f3f683c1d187 · 2016-04-18T14:56:40.000+02:00
Change-Id: I6d9c6abd0678653b584c8b46dc9e1d0626d67d01
diff --git a/websockets-server/server/example/hub/websocket.py b/websockets-server/server/example/hub/websocket.py
@@ -25,8 +25,10 @@
 from twisted.web.resource import Resource
 from autobahn.twisted.websocket import WebSocketServerFactory, \
     WebSocketServerProtocol
-from autobahn.twisted.resource import WebSocketResource, HTTPChannelHixie76Aware
+from autobahn.twisted.resource import WebSocketResource
 
+import txaio
+txaio.use_twisted()
 
 DELTA = timedelta(weeks=1)
 SAFE_WAIT = 3
@@ -58,7 +60,7 @@ def send_to_all(msg, except_connection=None):
     class EchoServerProtocol(WebSocketServerProtocol):
 
         def __init__(self):
-            pass
+            super(EchoServerProtocol, self).__init__()
 
         def send_error(self, error_message):
             logger.error(error_message)
@@ -122,8 +124,8 @@ def onOpen(self):
 
     url = "ws://%s:%d" % (host, port)
 
-    factory = WebSocketServerFactory(url)
-    factory.protocol = EchoServerProtocol
+    factory = WebSocketServerFactory(url, debug=True, debugCodePaths=True)
+    factory.protocol = lambda: EchoServerProtocol()
     factory.setProtocolOptions(allowHixie76=True)
 
     resource = WebSocketResource(factory)
diff --git a/websockets-server/server/setup.py b/websockets-server/server/setup.py
@@ -21,7 +21,7 @@
   author_email = "jacek.marchwicki@gmail.com",
   packages = find_packages(),
   license = "Apache 2.0",
-  install_requires = ['autobahn==0.10.7', 'twisted==15.4.0', 'pyasn1', 'SQLAlchemy', 'python-daemon', 'service_identity'],
+  install_requires = ['autobahn==0.10.7', 'twisted==15.4.0', 'pyasn1', 'SQLAlchemy', 'python-daemon', 'service_identity==14.0.0'],
   entry_points = {
     "console_scripts": [
       'websockets-server = example.hub:main',
