monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Customserver: only save on exit if it's in a good state. (#3351)

This commit is contained in:
Fabian Dill 2024-05-21 14:08:59 +02:00 committed by GitHub
parent fe7bc8784d
commit 461f5db35a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
WebHostLib/customserver.py
View File

@ -270,15 +270,19 @@ def run_server_process(name: str, ponyconfig: dict, static_server_data: dict,
await ctx.shutdown_task await ctx.shutdown_task
except (KeyboardInterrupt, SystemExit): except (KeyboardInterrupt, SystemExit):
pass if ctx.saving:
except Exception: ctx._save()
except Exception as e:
with db_session: with db_session:
room = Room.get(id=room_id) room = Room.get(id=room_id)
room.last_port = -1 room.last_port = -1
logger.exception(e)
raise raise
else:
if ctx.saving:
ctx._save()
finally: finally:
try: try:
ctx._save()
with (db_session): with (db_session):
# ensure the Room does not spin up again on its own, minute of safety buffer # ensure the Room does not spin up again on its own, minute of safety buffer
room = Room.get(id=room_id) room = Room.get(id=room_id)