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

Updated how the automatic timeout closes the session on the portal side. A lot cleaner now.

Browse source
This commit is contained in:
Griatch 2015-03-06 18:52:29 +01:00
parent 895f8504cd
commit 000f14c028
4 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
evennia/server/evennia_launcher.py
View file

@ -196,12 +196,11 @@ CMDLINE_HELP = \
VERSION_INFO = \ VERSION_INFO = \
""" """
{about}
Evennia {version} Evennia {version}
OS: {os} OS: {os}
Python: {python} Python: {python}
Twisted: {twisted} Twisted: {twisted}
Django: {django} Django: {django}{about}
""" """
ABOUT_INFO= \ ABOUT_INFO= \

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

@ -122,14 +122,9 @@ class PortalSessionHandler(SessionHandler):
from the portal side. from the portal side.
""" """
sessid = session.sessid sessid = session.sessid
if sessid in self.sessions:
del self.sessions[sessid]
del session
# tell server to also delete this session
self.portal.amp_protocol.call_remote_ServerAdmin(sessid, self.portal.amp_protocol.call_remote_ServerAdmin(sessid,
operation=PDISCONN) operation=PDISCONN)
def server_connect(self, protocol_path="", config=dict()): def server_connect(self, protocol_path="", config=dict()):
""" """
Called by server to force the initialization of a new Called by server to force the initialization of a new

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

@ -65,8 +65,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session):
delay(2, callback=self.handshake_done, retval=True) delay(2, callback=self.handshake_done, retval=True)
# set up a keep-alive # set up a keep-alive
self.keep_alive = LoopingCall(self._write, IAC + NOP, now=False) self.keep_alive = LoopingCall(self._write, IAC + NOP)
self.keep_alive.start(30) self.keep_alive.start(30, now=False)
def handshake_done(self, force=False): def handshake_done(self, force=False):

9
evennia/server/sessionhandler.py
View file

@ -185,14 +185,7 @@ class ServerSessionHandler(SessionHandler):
session = self.sessions.get(sessid, None) session = self.sessions.get(sessid, None)
if not session: if not session:
return return
player = session.player self.disconnect(session)
if player:
nsess = len(self.sessions_from_player(player)) - 1
remaintext = nsess and "%i session%s remaining" % (nsess, nsess > 1 and "s" or "") or "no more sessions"
session.log(_('Connection dropped: %s %s (%s)' % (session.player, session.address, remaintext)))
session.at_disconnect()
session.disconnect()
del self.sessions[session.sessid]
def portal_sessions_sync(self, portalsessions): def portal_sessions_sync(self, portalsessions):
""" """