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

WebHost: move atexit saving to end of room hosting function (#3339)

This commit is contained in:
Fabian Dill 2024-05-19 18:25:56 +02:00 committed by GitHub
parent d3f4ee4994
commit e97eddcdaf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MultiServer.py
View File

@ -508,7 +508,7 @@ class Context:
self.logger.exception(e) self.logger.exception(e)
self._start_async_saving() self._start_async_saving()
def _start_async_saving(self): def _start_async_saving(self, atexit_save: bool = True):
if not self.auto_saver_thread: if not self.auto_saver_thread:
def save_regularly(): def save_regularly():
# time.time() is platform dependent, so using the expensive datetime method instead # time.time() is platform dependent, so using the expensive datetime method instead
@ -532,8 +532,9 @@ class Context:
self.auto_saver_thread = threading.Thread(target=save_regularly, daemon=True) self.auto_saver_thread = threading.Thread(target=save_regularly, daemon=True)
self.auto_saver_thread.start() self.auto_saver_thread.start()
import atexit if atexit_save:
atexit.register(self._save, True) # make sure we save on exit too import atexit
atexit.register(self._save, True) # make sure we save on exit too
def get_save(self) -> dict: def get_save(self) -> dict:
self.recheck_hints() self.recheck_hints()

3
WebHostLib/customserver.py
View File

@ -142,7 +142,7 @@ class WebHostContext(Context):
savegame_data = Room.get(id=self.room_id).multisave savegame_data = Room.get(id=self.room_id).multisave
if savegame_data: if savegame_data:
self.set_save(restricted_loads(Room.get(id=self.room_id).multisave)) self.set_save(restricted_loads(Room.get(id=self.room_id).multisave))
self._start_async_saving() self._start_async_saving(atexit_save=False)
threading.Thread(target=self.listen_to_db_commands, daemon=True).start() threading.Thread(target=self.listen_to_db_commands, daemon=True).start()
@db_session @db_session
@ -278,6 +278,7 @@ def run_server_process(name: str, ponyconfig: dict, static_server_data: dict,
raise raise
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)