diff --git a/evennia/server/evennia_launcher.py b/evennia/server/evennia_launcher.py index 307ee37479..a05c6b602e 100644 --- a/evennia/server/evennia_launcher.py +++ b/evennia/server/evennia_launcher.py @@ -196,12 +196,11 @@ CMDLINE_HELP = \ VERSION_INFO = \ """ - {about} Evennia {version} OS: {os} Python: {python} Twisted: {twisted} - Django: {django} + Django: {django}{about} """ ABOUT_INFO= \ diff --git a/evennia/server/portal/portalsessionhandler.py b/evennia/server/portal/portalsessionhandler.py index 66bbbddb4f..c471375e09 100644 --- a/evennia/server/portal/portalsessionhandler.py +++ b/evennia/server/portal/portalsessionhandler.py @@ -122,14 +122,9 @@ class PortalSessionHandler(SessionHandler): from the portal side. """ 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, operation=PDISCONN) - def server_connect(self, protocol_path="", config=dict()): """ Called by server to force the initialization of a new diff --git a/evennia/server/portal/telnet.py b/evennia/server/portal/telnet.py index 0d96778658..1887fa1738 100644 --- a/evennia/server/portal/telnet.py +++ b/evennia/server/portal/telnet.py @@ -65,8 +65,8 @@ class TelnetProtocol(Telnet, StatefulTelnetProtocol, Session): delay(2, callback=self.handshake_done, retval=True) # set up a keep-alive - self.keep_alive = LoopingCall(self._write, IAC + NOP, now=False) - self.keep_alive.start(30) + self.keep_alive = LoopingCall(self._write, IAC + NOP) + self.keep_alive.start(30, now=False) def handshake_done(self, force=False): diff --git a/evennia/server/sessionhandler.py b/evennia/server/sessionhandler.py index 09e3bb2576..bb5bf796d8 100644 --- a/evennia/server/sessionhandler.py +++ b/evennia/server/sessionhandler.py @@ -185,14 +185,7 @@ class ServerSessionHandler(SessionHandler): session = self.sessions.get(sessid, None) if not session: return - player = session.player - 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] + self.disconnect(session) def portal_sessions_sync(self, portalsessions): """