@nginstack/engine-node 60.0.4 → 60.0.11

package/lib/Engine.js

@@ -78,6 +78,7 @@ class Engine {
     this.v8_ = options.v8 || false;
     this.startupTimeout = options.startupTimeout || ENGINE_STARTUP_TIMEOUT;
     this.startedSuccessfully = false;
+    this.inShutdown_ = false;
     this.redirectLogsToStdout_ = options.redirectLogsToStdout || false;
     this.onEngineClose_ = null;
     if (options.instanceId) {
@@ -127,7 +128,7 @@ class Engine {
     request.get(`http://localhost:${this.httpPort}${ENGINE_STATUS_URL}`, (_error, response) => {
       if (response && response.statusCode) {
         this.lastStatusCode_ = response.statusCode;
-        if (this.lastStatusCode_ === 500) {
+        if (this.lastStatusCode_ === 500 && !this.inShutdown_) {
           console.info(`Engine response (${response.statusCode}):\n${response.body}`);
         }
       } else {
@@ -247,6 +248,9 @@ class Engine {
             request.get(new URL(ENGINE_DOWNLOAD_URL, httpUrl).toString())
               .pipe(fs.createWriteStream(this.enginePath))
               .on('close', () => {
+                if (os.platform() != 'win32') {
+                  fs.chmodSync(path.join(this.installPath, ENGINE_APP), '755');
+                }
                 resolve();
               })
               .on('error', (reqErr) => {
@@ -323,10 +327,13 @@ class Engine {
           args.push('--additionalLoggerConfig=\'' + logConfig + '\'');
         }
 
-        this.process_ = child_process.spawn(ENGINE_APP, args, {
-          cwd: this.installPath,
-          windowsHide: true
-        });
+        this.inShutdown_ = false;
+        this.process_ = child_process.spawn(path.join(this.installPath, ENGINE_APP),
+          args,
+          {
+            cwd: this.installPath,
+            windowsHide: true
+          });
 
         this.process_.on('error', (err) => {
           console.error('Error starting Engine process:', err);
@@ -417,6 +424,7 @@ class Engine {
           } else {
             resolve();
           }
+          this.inShutdown_ = false;
         };
         this.sendShutdownCommand_();
       } else {
@@ -432,21 +440,28 @@ class Engine {
   sendShutdownCommand_() {
     if (this.process_) {
       let forceKill = true;
-      if (fs.existsSync(this.ngintPath_)) {
-        try {
-          console.info('Shutdown command sent to Engine process');
-          child_process.execFileSync(
-            this.ngintPath_,
-            ['shutdown', this.process_.pid, ENGINE_SHUTDOWN_TIMEOUT],
-            {
-              cwd: this.installPath,
-              windowsHide: true
-            }
-          );
-          forceKill = false;
-        } catch (e) {
-          console.error('Error stopping Engine', e);
+      this.inShutdown_ = true;
+      if (os.platform() == 'win32') {
+        if (fs.existsSync(this.ngintPath_)) {
+          try {
+            console.info('Shutdown command sent to Engine process');
+            child_process.execFileSync(
+              this.ngintPath_,
+              ['shutdown', this.process_.pid, ENGINE_SHUTDOWN_TIMEOUT],
+              {
+                cwd: this.installPath,
+                windowsHide: true
+              }
+            );
+            forceKill = false;
+          } catch (e) {
+            console.error('Error stopping Engine', e);
+          }
+        } else {
+          console.info('ngint was not found');
         }
+      } else {
+        process.kill(this.process_.pid, 'SIGTERM');
       }
       if (forceKill) {
         console.info('Kill signal sent to Engine process');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nginstack/engine-node",
-  "version": "60.0.4",
+  "version": "60.0.11",
   "publishConfig": {
     "access": "public"
   },
@@ -24,5 +24,5 @@
     "thread-sleep": "^2.2.0",
     "tmp": "^0.2.1"
   },
-  "gitHead": "04220d66e188e03f53186458381d4303124a227a"
+  "gitHead": "c2184d7ad379106cbee093a0aecccc4e56366c80"
 }