Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Server should ignore showDebugMessage

Browse Source
This commit is contained in:
Et0h 2014-11-02 11:08:56 +00:00
parent 1b3e370d6d
commit f1fbd18068
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
syncplay/protocols.py
View File

@ -30,7 +30,7 @@ class JSONCommandProtocol(LineReceiver):
if not line: if not line:
return return
try: try:
self._client.ui.showDebugMessage("client/server << {}".format(line)) self.showDebugMessage("client/server << {}".format(line))
messages = json.loads(line) messages = json.loads(line)
except: except:
self.dropWithError(getMessage("not-json-server-error").format(line)) self.dropWithError(getMessage("not-json-server-error").format(line))
@ -40,7 +40,7 @@ class JSONCommandProtocol(LineReceiver):
def sendMessage(self, dict_): def sendMessage(self, dict_):
line = json.dumps(dict_) line = json.dumps(dict_)
self.sendLine(line) self.sendLine(line)
self._client.ui.showDebugMessage("client/server >> {}".format(line)) self.showDebugMessage("client/server >> {}".format(line))
def drop(self): def drop(self):
self.transport.loseConnection() self.transport.loseConnection()
@ -57,6 +57,9 @@ class SyncClientProtocol(JSONCommandProtocol):
self.logged = False self.logged = False
self._pingService = PingService() self._pingService = PingService()
def showDebugMessage(self, line):
self._client.ui.showDebugMessage(line)
def connectionMade(self): def connectionMade(self):
self._client.initProtocol(self) self._client.initProtocol(self)
self.sendHello() self.sendHello()
@ -243,6 +246,9 @@ class SyncServerProtocol(JSONCommandProtocol):
return f(self, *args, **kwds) return f(self, *args, **kwds)
return wrapper return wrapper
def showDebugMessage(self, line):
pass
def dropWithError(self, error): def dropWithError(self, error):
print getMessage("client-drop-server-error").format(self.transport.getPeer().host, error) print getMessage("client-drop-server-error").format(self.transport.getPeer().host, error)
self.sendError(error) self.sendError(error)