querysub 0.212.0 → 0.213.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.212.0",
+  "version": "0.213.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/machineApplyMainCode.ts

@@ -18,7 +18,7 @@ import os from "os";
 import fs from "fs";
 import { lazy } from "socket-function/src/caching";
 import { setGitRef } from "../4-deploy/git";
-import { blue, magenta } from "socket-function/src/formatting/logColors";
+import { blue, green, magenta } from "socket-function/src/formatting/logColors";
 import { shutdown } from "../diagnostics/periodic";
 
 const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
@@ -126,7 +126,7 @@ const isScreenRunningProcess = measureWrap(async function isScreenRunningProcess
         let childPids = await getLinuxChildPids(pid);
         let bashPid = childPids.find(x => x.CMD.includes("bash"));
         if (!bashPid) {
-            console.error(`Screen pid ${pid} isn't even running bash? What? We can't check if it's running the process or not, so returning true, which disables crash detection...`);
+            console.error(`Screen pid ${pid} isn't even running bash? What? We can't check if it's running the process or not, so returning true, which disables crash detection... is running ${JSON.stringify(childPids)}`);
             return true;
         }
         let bashChildPids = await getLinuxChildPids(bashPid.PID);
@@ -140,7 +140,7 @@ const isScreenRunningProcess = measureWrap(async function isScreenRunningProcess
         return false;
     }
 });
-const getScreenState = measureWrap(async function getScreenState(): Promise<{
+const getScreenState = measureWrap(async function getScreenState(populateIsProcessRunning: boolean = true): Promise<{
     screenName: string;
     isProcessRunning: boolean;
     pid: string;
@@ -159,9 +159,11 @@ const getScreenState = measureWrap(async function getScreenState(): Promise<{
         .filter(x => x.screenName.endsWith(SCREEN_SUFFIX))
         ;
 
-    await Promise.all(screenList.map(async x => {
-        x.isProcessRunning = await isScreenRunningProcess(x.pid);
-    }));
+    if (populateIsProcessRunning) {
+        await Promise.all(screenList.map(async x => {
+            x.isProcessRunning = await isScreenRunningProcess(x.pid);
+        }));
+    }
 
     return screenList;
 });
@@ -257,7 +259,10 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
                 let sameParameters = prevParameters === newParametersString;
                 let screenIsRunning = screenStateMap.get(screenName)?.isProcessRunning;
 
-                if (sameParameters && screenIsRunning) continue;
+                if (sameParameters && screenIsRunning) {
+                    console.log(green(`Verified ${magenta(config.serviceId)} is running`));
+                    continue;
+                }
 
                 console.log(`Resyncing service ${magenta(config.serviceId)}`);
 
@@ -268,7 +273,7 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
                     command: config.parameters.command,
                 });
                 await delay(2000);
-                let newScreens = await getScreenState();
+                let newScreens = await getScreenState(false);
                 let foundScreen = newScreens.find(x => x.screenName === screenName);
                 if (!foundScreen) {
                     console.error(`Just created screen ${screenName}, but it's not in the list of screens!`);
@@ -279,6 +284,7 @@ const resyncServices = runInSerial(measureWrap(async function resyncServices() {
                     let logs = await runPromise(`${prefix}tmux capture-pane -t ${screenName} -p`);
                     throw new Error(`${logs}\n\nService ${magenta(config.serviceId)} is not running after starting. Trying again in ${formatTime(MACHINE_RESYNC_INTERVAL)}, or on next change. Last logs above.`);
                 }
+                console.log(green(`Service ${magenta(config.serviceId)} is verified to be running after starting.`));
 
                 machineInfo.services[config.serviceId] = {
                     lastLaunchedTime: Date.now(),