querysub 0.569.0 → 0.571.0

package/appSecrets.ts

@@ -23,6 +23,8 @@ export const getCloudflareCreds = lazy(async (): Promise<{ key: string; email: s
 
 /** Serves the secret keys sliftutils' getSecret expects, reading them the way querysub already does: backblaze creds off disk (getBackblazePath), cloudflare creds from the keys archives bucket (with its local file fallback). */
 export async function getAppSecret(key: string): Promise<string | undefined> {
+    // HACK: This is used by the storage server. Which we want to shut down immediately. That way the next instance can start up. The sword server already looks for notifications about when it's going to be shutting down and it flushes to disk early in this case, so it should be fairly safe to hard kill it.
+    doImmediateShutdown();
     // Import query sub so our logs go to our actual log server. Otherwise we won't know if we get any errors. 
     Querysub;
     if (key.startsWith("backblaze.json.")) {
@@ -39,3 +41,22 @@ export async function getAppSecret(key: string): Promise<string | undefined> {
     }
     return undefined;
 }
+
+let doImmediateShutdown = lazy(() => {
+    // NOTE: This extra code is required to actual capture ctrl+c
+    if (process.platform === "win32") {
+        var rl = require("readline").createInterface({
+            input: process.stdin,
+            output: process.stdout
+        });
+
+        rl.on("SIGINT", function () {
+            process.emit("SIGINT");
+        });
+    }
+    function doShutdown() {
+        console.log("SIGINT received, shutting down immediately");
+        process.exit();
+    }
+    process.on("SIGINT", doShutdown);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.569.0",
+  "version": "0.571.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/components/ProcessesView.tsx

@@ -32,14 +32,15 @@ class ProcessOutput extends qreact.Component<{ record: ProcessRecord; machineNod
     private unmounted = false;
     componentDidMount() {
         // Props are synchronized state, so the plain values the async work needs are read here
-        let { folder, launchId } = this.props.record;
+        let { folder, pid, startTime } = this.props.record;
         let nodeId = this.props.machineNodeId;
         let callbackId = this.callbackId;
         this.watching = (async () => {
             await watchProcessOutput({
                 nodeId,
                 folder,
-                launchId,
+                pid,
+                startTime,
                 callbackId,
                 onData: async (data: string) => {
                     Querysub.commit(() => {
@@ -153,9 +154,9 @@ class MachineProcesses extends qreact.Component<{ machineId: string; applyNodeId
                     {this.state.showHistorical && `Hide ${historical.length} historical` || `Show ${historical.length} historical`}
                 </Button>}
             </div>
-            {running.map(record => <ProcessRow key={record.launchId} record={record} machineNodeId={this.props.applyNodeId} />)}
+            {running.map(record => <ProcessRow key={`${record.pid}-${record.startTime}`} record={record} machineNodeId={this.props.applyNodeId} />)}
             {this.state.showHistorical && historical.map(record =>
-                <ProcessRow key={record.launchId} record={record} machineNodeId={this.props.applyNodeId} />
+                <ProcessRow key={`${record.pid}-${record.startTime}`} record={record} machineNodeId={this.props.applyNodeId} />
             )}
         </div>;
     }