Skip to content

Commit

Permalink
Merge pull request #107 from UncleRus/master
Browse files Browse the repository at this point in the history
Use the bus object to log rather than directly the cherrypy object (though they can be both the same, it's not necessary).
  • Loading branch information
Lawouach committed Oct 8, 2013
2 parents 0875a6e + 2a6c01e commit 0499e4c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions ws4py/server/cherrypyserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -282,14 +282,14 @@ def __init__(self, bus):
self.manager = WebSocketManager()

def start(self):
cherrypy.log("Starting WebSocket processing")
self.bus.log("Starting WebSocket processing")
self.bus.subscribe('stop', self.cleanup)
self.bus.subscribe('handle-websocket', self.handle)
self.bus.subscribe('websocket-broadcast', self.broadcast)
self.manager.start()

def stop(self):
cherrypy.log("Terminating WebSocket processing")
self.bus.log("Terminating WebSocket processing")
self.bus.unsubscribe('stop', self.cleanup)
self.bus.unsubscribe('handle-websocket', self.handle)
self.bus.unsubscribe('websocket-broadcast', self.broadcast)
Expand Down

0 comments on commit 0499e4c

Please sign in to comment.