querysub 0.246.0 → 0.247.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.246.0",
+  "version": "0.247.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

@@ -267,7 +267,12 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
     if (pid && await isScreenRunningProcess(pid)) {
         // It doesn't want to die. Wait longer, but it it just won't die, kill the screen
         console.warn(`Screen ${screenName} is not dying, giving it another 30 seconds`);
-        await delay(timeInSecond * 30);
+        for (let i = 0; i < 6; i++) {
+            await delay(5);
+            if (!await isScreenRunningProcess(pid)) {
+                break;
+            }
+        }
         if (pid && await isScreenRunningProcess(pid)) {
             console.warn(`Screen ${screenName} is still running, killing it forcefully`);
             await killScreen({ screenName });
@@ -297,9 +302,6 @@ ${config.command}
     let pipeScript = path.resolve(config.folder + "../pipe.sh");
     await fs.promises.writeFile(pipeScript, `#!/bin/bash
 line_count=0
-max_lines_limit=$((${PIPE_FILE_LINE_LIMIT} * 100))
-keep_lines_count=$((${PIPE_FILE_LINE_LIMIT} * 50))
-
 while IFS= read -r line; do
     echo "$line" >> "${pipeFile}"
     ((line_count++))
@@ -309,9 +311,9 @@ while IFS= read -r line; do
         if [ -f "${pipeFile}" ]; then
             # Count total lines in file
             total_lines=$(wc -l < "${pipeFile}")
-            if [ "$total_lines" -gt "$max_lines_limit" ]; then
-                # Keep only the last N lines when file gets too many lines
-                tail -n "$keep_lines_count" "${pipeFile}" > "${pipeFile}.tmp" && mv "${pipeFile}.tmp" "${pipeFile}"
+            if [ "$total_lines" -gt ${PIPE_FILE_LINE_LIMIT} ]; then
+                # Keep only the last ${PIPE_FILE_LINE_LIMIT} lines when file gets too many lines
+                tail -n ${Math.floor(PIPE_FILE_LINE_LIMIT / 2)} "${pipeFile}" > "${pipeFile}.tmp" && mv "${pipeFile}.tmp" "${pipeFile}"
             fi
         fi
     fi