Remove the fish.exit file after the worker has stopped.

It seems more useful that way... Raise worker version to 229 (also server side)
ppigazzini · Feb 24, 2024 · 6e675ab · 6e675ab
1 parent 5898806
commit 6e675ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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)
Original file line number	Diff line number	Diff line change
		@@ -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"}