querysub 0.574.0 → 0.575.0

package/appSecrets.ts

@@ -3,6 +3,7 @@ import { lazy } from "socket-function/src/caching";
 import { ArchivesBackblaze } from "sliftutils/storage/backblaze";
 import { STORAGE_DIR, getDomain, getBackblazePath } from "./src/misc/appPaths";
 import { Querysub } from "./src/4-querysub/Querysub";
+import { formatDateTime } from "socket-function/src/formatting/format";
 
 const keysArchives = lazy(() => new ArchivesBackblaze({ bucketName: getDomain() }));
 
@@ -55,7 +56,7 @@ let doImmediateShutdown = lazy(() => {
         });
     }
     function doShutdown() {
-        console.log("SIGINT received, shutting down immediately");
+        console.log(`SIGINT received, shutting down immediately (${formatDateTime(Date.now())})`);
         process.exit();
     }
     process.on("SIGINT", doShutdown);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.574.0",
+  "version": "0.575.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/processManager.ts

@@ -347,6 +347,8 @@ export async function retireCurrentScreen(config: {
         // The file in the folder belongs to its replacement now, so only the registration goes
         void removeServiceNode({ folder, nodeId, ownsFile: false });
     }
+    // Started here rather than waiting for a resync to notice the screen: with a killTime already past - a zero overlap - this takes it down right now
+    void retireScreen(retiringScreenName);
 }
 
 /** Ends a session at once, with no notice - for a screen that should not exist at all, so there is nothing to wind down gracefully. Finding one is always a surprise, so the reason it was not supposed to be there is logged. */
@@ -363,7 +365,7 @@ export const killScreen = measureWrap(async function killScreen(config: {
     console.log(red(`Killing screen ${config.screenName} (Ctrl+C, then killing the session in ${formatTime(SHUTDOWN_GRACE_TIME)})`));
     let prefix = getTmuxPrefix();
     // Purely a notice to the process that it is going away, so it can wind down. We never check whether it worked and we never reuse the screen - the session is killed either way.
-    await runPromise(`${prefix}tmux send-keys -t ${config.screenName} 'C-c' Enter`);
+    void runPromise(`${prefix}tmux send-keys -t ${config.screenName} 'C-c' Enter`);
     await delay(SHUTDOWN_GRACE_TIME);
     await runPromise(`${prefix}tmux kill-session -t ${config.screenName}`);
 });