Use OrderedDict for geventwebsocket.Resource spec so geventwebsockets>=0.9.4 doesn't complain.

This commit is contained in:
Tyson Clugg 2015-05-27 15:16:07 +10:00
parent 765def3d21
commit 8327aac633

View file

@ -88,13 +88,15 @@ def serve(listen, debug=False, **ssl_args):
wsgi_app = get_wsgi_application()
wsgi_name = str(wsgi_app.__class__)
resource = geventwebsocket.Resource({
r'/websocket': DDPWebSocketApplication,
r'^/sockjs/\d+/\w+/websocket$': DDPWebSocketApplication,
r'^/sockjs/\d+/\w+/xhr$': ddpp_sockjs_xhr,
r'^/sockjs/info$': ddpp_sockjs_info,
r'^/(?!(websocket|sockjs)/)': wsgi_app,
})
resource = geventwebsocket.Resource(
collections.OrderedDict([
(r'/websocket', DDPWebSocketApplication),
(r'^/sockjs/\d+/\w+/websocket$', DDPWebSocketApplication),
(r'^/sockjs/\d+/\w+/xhr$', ddpp_sockjs_xhr),
(r'^/sockjs/info$', ddpp_sockjs_info),
(r'^/(?!(websocket|sockjs)/)', wsgi_app),
]),
)
# setup WebSocketServer to dispatch web requests
webservers = [