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

cleanup from rebase nightmare

Browse source
This commit is contained in:
Cal 2023-12-20 11:49:02 -07:00
parent a0b3b9649b
commit 610e6ad12f
1 changed files with 0 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
evennia/server/portal/webclient_ajax.py
View file

@ -336,11 +336,6 @@ class AjaxWebClient(resource.Resource):
del self.requests[csessid] del self.requests[csessid]
if csessid in self.databuffer: if csessid in self.databuffer:
del self.databuffer[csessid] del self.databuffer[csessid]
if csessid in self.requests:
self.requests[csessid].finish()
del self.requests[csessid]
if csessid in self.databuffer:
del self.databuffer[csessid]
def mode_init(self, request): def mode_init(self, request):
""" """
@ -436,7 +431,6 @@ class AjaxWebClient(resource.Resource):
csessid = self.get_client_sessid(request) + self.get_client_page_id(request) csessid = self.get_client_sessid(request) + self.get_client_page_id(request)
self.last_alive[csessid] = (time.time(), False) self.last_alive[csessid] = (time.time(), False)
dataentries = self.databuffer.get(csessid)
dataentries = self.databuffer.get(csessid) dataentries = self.databuffer.get(csessid)
if dataentries: if dataentries:
# we have data that could not be sent earlier (because client was not # we have data that could not be sent earlier (because client was not
@ -449,10 +443,6 @@ class AjaxWebClient(resource.Resource):
if csessid in self.requests: if csessid in self.requests:
self.requests[csessid].finish() # Clear any stale request. self.requests[csessid].finish() # Clear any stale request.
self.requests[csessid] = request self.requests[csessid] = request
request.notifyFinish().addErrback(self._responseFailed, csessid, request)
if csessid in self.requests:
self.requests[csessid].finish() # Clear any stale request.
self.requests[csessid] = request
return server.NOT_DONE_YET return server.NOT_DONE_YET
def mode_close(self, request): def mode_close(self, request):
@ -466,12 +456,10 @@ class AjaxWebClient(resource.Resource):
""" """
csessid = self.get_client_sessid(request) + self.get_client_page_id(request) csessid = self.get_client_sessid(request) + self.get_client_page_id(request)
try: try:
sess = self.sessionhandler.sessions_from_csessid(csessid)[0]
sess = self.sessionhandler.sessions_from_csessid(csessid)[0] sess = self.sessionhandler.sessions_from_csessid(csessid)[0]
sess.sessionhandler.disconnect(sess) sess.sessionhandler.disconnect(sess)
except IndexError: except IndexError:
self.client_disconnect(csessid) self.client_disconnect(csessid)
self.client_disconnect(csessid)
return b'""' return b'""'
def render_POST(self, request): def render_POST(self, request):