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

More bugfixes.

Browse source
This commit is contained in:
Griatch 2013-09-21 22:22:53 +02:00
parent 2ba16e155e
commit dd27b4b77d
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/server/amp.py
View file

@ -303,18 +303,18 @@ class AMPProtocol(amp.AMP):
return {} return {}
MsgPortal2Server.responder(amp_msg_portal2server) MsgPortal2Server.responder(amp_msg_portal2server)
def call_remote_MsgPortal2Server(self, sessid, msg, **kwargs): def call_remote_MsgPortal2Server(self, sessid, msg, data=""):
""" """
Access method called by the Portal and executed on the Portal. Access method called by the Portal and executed on the Portal.
""" """
#print "msg portal->server (portal side):", sessid, msg #print "msg portal->server (portal side):", sessid, msg, data
try: try:
return self.callRemote(MsgPortal2Server, return self.callRemote(MsgPortal2Server,
sessid=sessid, sessid=sessid,
msg=msg, msg=msg,
ipart=0, ipart=0,
nparts=1, nparts=1,
data=dumps(kwargs)).addErrback(self.errback, "MsgPortal2Server") data=dumps(data)).addErrback(self.errback, "MsgPortal2Server")
except amp.TooLong: except amp.TooLong:
# the msg (or data) was too long for AMP to send. We need to send in blocks. # the msg (or data) was too long for AMP to send. We need to send in blocks.
return self.send_split_msg(sessid, msg, kwargs, MsgPortal2Server) return self.send_split_msg(sessid, msg, kwargs, MsgPortal2Server)
@ -343,18 +343,18 @@ class AMPProtocol(amp.AMP):
return {} return {}
MsgServer2Portal.responder(amp_msg_server2portal) MsgServer2Portal.responder(amp_msg_server2portal)
def call_remote_MsgServer2Portal(self, sessid, msg, **kwargs): def call_remote_MsgServer2Portal(self, sessid, msg, data=""):
""" """
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, kwargs #print "msg server->portal (server side):", sessid, msg, data
try: try:
return self.callRemote(MsgServer2Portal, return self.callRemote(MsgServer2Portal,
sessid=sessid, sessid=sessid,
msg=to_str(msg), msg=to_str(msg),
ipart=0, ipart=0,
nparts=1, nparts=1,
data=dumps(kwargs)).addErrback(self.errback, "MsgServer2Portal") data=dumps(data)).addErrback(self.errback, "MsgServer2Portal")
except amp.TooLong: except amp.TooLong:
# the msg (or data) was too long for AMP to send. We need to send in blocks. # the msg (or data) was too long for AMP to send. We need to send in blocks.
return self.send_split_msg(sessid, msg, kwargs, MsgServer2Portal) return self.send_split_msg(sessid, msg, kwargs, MsgServer2Portal)

3
src/utils/idmapper/base.py
View file

@ -134,8 +134,7 @@ class SharedMemoryModelBase(ModelBase):
fget = lambda cls: _get(cls, fieldname) fget = lambda cls: _get(cls, fieldname)
fset = lambda cls, val: _set(cls, fieldname, val) if editable else _set_nonedit(cls, fieldname, val) fset = lambda cls, val: _set(cls, fieldname, val) if editable else _set_nonedit(cls, fieldname, val)
fdel = lambda cls: _del(cls, fieldname) if editable else _del_nonedit(cls,fieldname) fdel = lambda cls: _del(cls, fieldname) if editable else _del_nonedit(cls,fieldname)
doc = "Wraps setting, saving and deleting the %s field." % fieldname type(cls).__setattr__(cls, wrappername, property(fget, fset, fdel))
type(cls).__setattr__(cls, wrappername, property(fget, fset, fdel, doc))
# exclude some models that should not auto-create wrapper fields # exclude some models that should not auto-create wrapper fields
if cls.__name__ in ("ServerConfig", "TypeNick"): if cls.__name__ in ("ServerConfig", "TypeNick"):