small update

PrivateSky · Jul 18, 2019 · 2f5a9d2 · 2f5a9d2
1 parent b97686d
commit 2f5a9d2
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -12,6 +12,6 @@ When a new version of PrivateSky code will be released the clones of the pskrunt
 The following scripts are available to run: 
 
 ``` npm run start ``` will run a PrivateSky node  
-``` npm run build ``` will build the code for the domain and deply in the current domain  
+``` npm run build ``` will build the code for the domain and deploy in the current domain  
 ``` npm run watch ``` will automatically build the code for the domain and deploy  
 ``` npm run console ``` will launch a bash or cmd with paths to run pskadmin tools  
diff --git a/psknode/bin/pskbuild.js b/psknode/bin/pskbuild.js
diff --git a/psknode/bin/psknode.js b/psknode/bin/psknode.js
diff --git a/psknode/bin/scripts/psknode.js b/psknode/bin/scripts/psknode.js
@@ -5,6 +5,8 @@
  */
 
 const {spawnSync, fork, spawn} = require('child_process');
+const max_timeout = 10*60*1000; // 10 minutes
+const restartDelays = {};
 
 let shouldRestart = true;
 const forkedProcesses = {};
@@ -16,11 +18,21 @@ function startProcess(filePath) {
 
     console.log('SPAWNED ', forkedProcesses[filePath].pid);
 
+    function restartWithDelay(filePath){
+        let timeout = restartDelays[filePath] || 100;
+        console.log(`Process will restart in ${timeout} ms ...`);
+        setTimeout(()=>{
+            restartDelays[filePath] = (timeout * 2) % max_timeout;
+            startProcess(filePath);
+        }, timeout);
+    }
+
     function errorHandler(filePath) {
+        let timeout = 100;
         return function (error) {
             console.log(`\x1b[31mException caught on spawning file ${filePath} `, error ? error : "", "\x1b[0m"); //last string is to reset terminal colours
             if (shouldRestart) {
-                startProcess(filePath);
+                restartWithDelay(filePath);
             }
         }
     }
@@ -29,7 +41,7 @@ function startProcess(filePath) {
         return function () {
             console.log(`\x1b[33mExit caught on spawned file ${filePath}`, "\x1b[0m"); //last string is to reset terminal colours
             if (shouldRestart) {
-                startProcess(filePath);
+                restartWithDelay(filePath);
             }
         }
     }

diff --git a/psknode/bundles/pskruntime.js b/psknode/bundles/pskruntime.js
diff --git a/psknode/bundles/readme.txt b/psknode/bundles/readme.txt
diff --git a/psknode/core/launcher.js b/psknode/core/launcher.js
@@ -65,12 +65,15 @@ function launchDomainSandbox(name, configuration) {
         child_env.config = JSON.stringify(env.config);
         child_env.PRIVATESKY_TMP = process.env.PRIVATESKY_TMP;
         child_env.PRIVATESKY_ROOT_FOLDER = process.env.PRIVATESKY_ROOT_FOLDER;
+
         const child = childProcess.fork('sandboxes/domainSandbox.js', [name], {cwd: __dirname, env: child_env});
         child.on('exit', (code, signal) => {
-            console.log(`DomainSandbox [${name}] got an error code ${code}. Restarting...`);
-        delete domainSandboxes[name];
-        launchDomainSandbox(name, configuration);
-    });
+            setTimeout(()=>{
+                console.log(`DomainSandbox [${name}] got an error code ${code}. Restarting...`);
+                delete domainSandboxes[name];
+                launchDomainSandbox(name, configuration);
+            }, 100);
+        });
 
         domainSandboxes[name] = child;
     } else {

diff --git a/psknode/core/utils/exitHandler.js b/psknode/core/utils/exitHandler.js
@@ -2,13 +2,29 @@ const events = ["exit", "SIGINT", "SIGUSR1", "SIGUSR2", "uncaughtException", "SI
 
 module.exports = function manageShutdownProcess(childrenList){
 
+    let shutting = false;
     function handler(){
-        console.log("Handling exit event on", process.pid, "arguments:", arguments);
+        //console.log("Handling exit event on", process.pid, "arguments:", arguments);
         var childrenNames = Object.keys(childrenList);
         for(let j=0; j<childrenNames.length; j++){
             var child = childrenList[childrenNames[j]];
-            console.log(`[${process.pid}]`, "Sending kill signal to PID:", child.pid);
-            process.kill(child.pid);
+            //console.log(`[${process.pid}]`, "Sending kill signal to PID:", child.pid);
+            try{
+                process.kill(child.pid);
+            }catch(err){
+                //...
+            }
+        }
+
+        if(!shutting){
+            try{
+                process.stdout.cursorTo(0);
+                process.stdout.write(`[PID: ${process.pid}] [Timestamp: ${new Date().getTime()}] [Process argv: ${process.argv}]- Shutting down...\n`);
+            }catch(err)
+            {
+                //...
+            }
+            shutting = true;
         }
 
         setTimeout(()=>{