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

Fixed a bug in sessionhandler that erroneously caused Portal sessions to not be deleted properly at user @quit. This caused the session to be copied back to the Server side after a reload (caused "ghost" connections in e.g. the "who" command). Resolves Issue 244.

Browse source
This commit is contained in:
Griatch 2012-06-20 23:48:19 +02:00
parent 7dcfdc4d4b
commit f0f240b7ce
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/commands/default/general.py
View file

@ -408,7 +408,7 @@ class CmdWho(MuxCommand):
table[0].append(plr_pobject.name[:25]) table[0].append(plr_pobject.name[:25])
table[1].append(utils.time_format(delta_conn, 0)) table[1].append(utils.time_format(delta_conn, 0))
table[2].append(utils.time_format(delta_cmd, 1)) table[2].append(utils.time_format(delta_cmd, 1))
table[3].append(plr_pobject.location.id) table[3].append(plr_pobject.location and plr_pobject.location.id or "None")
table[4].append(session.cmd_total) table[4].append(session.cmd_total)
table[5].append(session.address[0]) table[5].append(session.address[0])
else: else:

5
src/server/sessionhandler.py
View file

@ -379,6 +379,9 @@ class PortalSessionHandler(SessionHandler):
session = self.sessions.get(sessid, None) session = self.sessions.get(sessid, None)
if session: if session:
session.disconnect(reason) session.disconnect(reason)
if sessid in self.sessions:
# in case sess.disconnect doesn't delete it
del self.sessions[sessid]
del session del session
def server_disconnect_all(self, reason=""): def server_disconnect_all(self, reason=""):
@ -388,7 +391,7 @@ class PortalSessionHandler(SessionHandler):
for session in self.sessions.values(): for session in self.sessions.values():
session.disconnect(reason) session.disconnect(reason)
del session del session
self.sessions = {}
def count_loggedin(self, include_unloggedin=False): def count_loggedin(self, include_unloggedin=False):
""" """