querysub 0.201.0 → 0.202.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.201.0",
+  "version": "0.202.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/machine.sh

@@ -1,3 +1,6 @@
 #! /bin/bash
 tmux new -s machine-alwaysup -d
+# Kill anything that is running on it first
+tmux send-keys -t machine-alwaysup "C-c" Enter
+sleep 3
 tmux send-keys -t machine-alwaysup "cd ~/machine-alwaysup && yarn machine-alwaysup" Enter

package/src/deployManager/machineApplyMainCode.ts

@@ -329,19 +329,20 @@ export async function machineApplyMain() {
         console.error(`Always up error: ${lastError}`);
     }
 
-    let isRunningPath = os.homedir() + "/isMachineApplyRunning.txt";
-    if (fs.existsSync(isRunningPath)) {
-        let parts = await fs.promises.readFile(isRunningPath, "utf8");
-        let [ppid, pid] = parts.split("-");
-        let pidRunning = await isPIDRunning(pid);
-        let ppidRunning = pidRunning && await isPIDRunning(ppid);
-        let actualPPID = ppidRunning && await getPPID(pid);
-        if (pidRunning && ppidRunning && actualPPID === ppid) {
-            console.error(`Machine apply is already running in pid ${pid}, exiting duplicate`);
-            process.exit(1);
-        }
-    }
-    await fs.promises.writeFile(isRunningPath, `${process.ppid}-${process.pid}`);
+    // Removed, because it wasn't working...
+    // let isRunningPath = os.homedir() + "/isMachineApplyRunning.txt";
+    // if (fs.existsSync(isRunningPath)) {
+    //     let parts = await fs.promises.readFile(isRunningPath, "utf8");
+    //     let [ppid, pid] = parts.split("-");
+    //     let pidRunning = await isPIDRunning(pid);
+    //     let ppidRunning = pidRunning && await isPIDRunning(ppid);
+    //     let actualPPID = ppidRunning && await getPPID(pid);
+    //     if (pidRunning && ppidRunning && actualPPID === ppid) {
+    //         console.error(`Machine apply is already running in pid ${pid}, exiting duplicate`);
+    //         process.exit(1);
+    //     }
+    // }
+    // await fs.promises.writeFile(isRunningPath, `${process.ppid}-${process.pid}`);
 
     await Querysub.hostService("machine-apply");
     onServiceConfigChange(resyncServices);