Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Turning off debug messages for OOB

Browse source
This commit is contained in:
Griatch 2015-02-14 20:18:08 +01:00
parent cc39aff62c
commit d8286a592e
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/server/amp.py
View file

@ -376,7 +376,7 @@ class AMPProtocol(amp.AMP):
ret = self.safe_recv(MsgServer2Portal, sessid, ret = self.safe_recv(MsgServer2Portal, sessid,
ipart, nparts, text=msg, data=data) ipart, nparts, text=msg, data=data)
if ret is not None: if ret is not None:
print "msg server->portal (portal side):", sessid, ret["text"], loads(ret["data"]) #print "msg server->portal (portal side):", sessid, ret["text"], loads(ret["data"])
self.factory.portal.sessions.data_out(sessid, self.factory.portal.sessions.data_out(sessid,
text=ret["text"], text=ret["text"],
**loads(ret["data"])) **loads(ret["data"]))
@ -387,7 +387,7 @@ class AMPProtocol(amp.AMP):
""" """
Access method called by the Server and executed on the Server. Access method called by the Server and executed on the Server.
""" """
print "msg server->portal (server side):", sessid, msg, data #print "msg server->portal (server side):", sessid, msg, data
return self.safe_send(MsgServer2Portal, sessid, return self.safe_send(MsgServer2Portal, sessid,
msg=msg if msg is not None else "", msg=msg if msg is not None else "",
data=dumps(data)) data=dumps(data))

4
evennia/server/portal/portalsessionhandler.py
View file

@ -269,9 +269,9 @@ class PortalSessionHandler(SessionHandler):
if session: if session:
# convert oob to the generic format # convert oob to the generic format
if "oob" in kwargs: if "oob" in kwargs:
print "oobstruct_parser in:", kwargs["oob"] #print "oobstruct_parser in:", kwargs["oob"]
kwargs["oob"] = self.oobstruct_parser(kwargs["oob"]) kwargs["oob"] = self.oobstruct_parser(kwargs["oob"])
print "oobstruct_parser out:", kwargs["oob"] #print "oobstruct_parser out:", kwargs["oob"]
session.data_out(text=text, **kwargs) session.data_out(text=text, **kwargs)
PORTAL_SESSIONS = PortalSessionHandler() PORTAL_SESSIONS = PortalSessionHandler()

6
evennia/server/portal/telnet_oob.py
View file

@ -158,7 +158,7 @@ class TelnetOOB(object):
gmcp_string = "%s %s" % (cmdname, json.dumps(args)) gmcp_string = "%s %s" % (cmdname, json.dumps(args))
elif kwargs: elif kwargs:
gmcp_string = "%s %s" % (cmdname, json.dumps(kwargs)) gmcp_string = "%s %s" % (cmdname, json.dumps(kwargs))
print "gmcp_encode", cmdname, args, kwargs, "->", gmcp_string #print "gmcp_encode", cmdname, args, kwargs, "->", gmcp_string
return force_str(gmcp_string).strip() return force_str(gmcp_string).strip()
def decode_msdp(self, data): def decode_msdp(self, data):
@ -219,7 +219,7 @@ class TelnetOOB(object):
if hasattr(data, "__iter__"): if hasattr(data, "__iter__"):
data = "".join(data) data = "".join(data)
print "decode_gmcp:", data #print "decode_gmcp:", data
if data: if data:
splits = data.split(None, 1) splits = data.split(None, 1)
cmdname = splits[0] cmdname = splits[0]
@ -238,7 +238,7 @@ class TelnetOOB(object):
args = tuple(struct) args = tuple(struct)
else: else:
args = (struct,) args = (struct,)
print "gmcp decode:", data, "->", cmdname, args, kwargs #print "gmcp decode:", data, "->", cmdname, args, kwargs
self.protocol.data_in(oob=(cmdname, args, kwargs)) self.protocol.data_in(oob=(cmdname, args, kwargs))
# access methods # access methods

2
evennia/server/sessionhandler.py
View file

@ -438,7 +438,7 @@ class ServerSessionHandler(SessionHandler):
if not _OOB_HANDLER: if not _OOB_HANDLER:
from evennia.server.oobhandler import OOB_HANDLER as _OOB_HANDLER from evennia.server.oobhandler import OOB_HANDLER as _OOB_HANDLER
funcname, args, kwargs = kwargs.pop("oob") funcname, args, kwargs = kwargs.pop("oob")
print "OOB session.data_in:", funcname, args, kwargs #print "OOB session.data_in:", funcname, args, kwargs
if funcname: if funcname:
_OOB_HANDLER.execute_cmd(session, funcname, *args, **kwargs) _OOB_HANDLER.execute_cmd(session, funcname, *args, **kwargs)