diff --git a/server/fishtest/api.py b/server/fishtest/api.py index a9914e7f0..7e36940fc 100644 --- a/server/fishtest/api.py +++ b/server/fishtest/api.py @@ -28,7 +28,7 @@ on how frequently the main instance flushes its run cache. """ -WORKER_VERSION = 228 +WORKER_VERSION = 229 """ begin api_schema diff --git a/worker/sri.txt b/worker/sri.txt index a689d5763..2fea705bb 100644 --- a/worker/sri.txt +++ b/worker/sri.txt @@ -1 +1 @@ -{"__version": 228, "updater.py": "Mg+pWOgGA0gSo2TuXuuLCWLzwGwH91rsW1W3ixg3jYauHQpRMtNdGnCfuD1GqOhV", "worker.py": "fBx5K3aP5qJ1jRncVtWy0vzGgR6wokMWB+agEsZFAjOr3s8qJZL1JOc13rIiOGVk", "games.py": "C0yeQ5Oh8eyca64NntP+oetpWAjCvPSWdMyNCGSeS4o9yJN41L4SkL9rTx3z716m"} +{"__version": 229, "updater.py": "Mg+pWOgGA0gSo2TuXuuLCWLzwGwH91rsW1W3ixg3jYauHQpRMtNdGnCfuD1GqOhV", "worker.py": "ZqWya/LcB5xq0sj+M/D1CApoBt0vGSTtBeaBLs3sFDEXezhfM0xdJCMeXlJZWN+5", "games.py": "C0yeQ5Oh8eyca64NntP+oetpWAjCvPSWdMyNCGSeS4o9yJN41L4SkL9rTx3z716m"} diff --git a/worker/worker.py b/worker/worker.py index 7a7b6f9a5..51cd9f13b 100644 --- a/worker/worker.py +++ b/worker/worker.py @@ -55,7 +55,7 @@ # Several packages are called "expression". # So we make sure to use the locally installed one. -WORKER_VERSION = 228 +WORKER_VERSION = 229 FILE_LIST = ["updater.py", "worker.py", "games.py"] HTTP_TIMEOUT = 30.0 INITIAL_RETRY_TIME = 15.0 @@ -1662,6 +1662,9 @@ def worker(): clear_binaries = False delay = INITIAL_RETRY_TIME + if fish_exit: + (worker_dir / "fish.exit").unlink() + print("Waiting for the heartbeat thread to finish...") heartbeat_thread.join(THREAD_JOIN_TIMEOUT)