fixed issue `ersions(), added system openssl version

2018-11-05 20:25:46 +01:00
parent cc78ec3b0d
commit c9b8da326f
3 changed files with 18 additions and 3 deletions
@@ -276,6 +276,8 @@ function versions(callback) {
      let result = {
        kernel: os.release(),
        openssl: process.versions.openssl,
+        systemOpenssl: '',
+        systemOpensslLib: '',
        node: process.versions.node,
        v8: process.versions.v8,
        npm: '',
@@ -293,7 +295,7 @@ function versions(callback) {
      };

      let functionProcessed = (function () {
-        let totalFunctions = 13;
+        let totalFunctions = 14;
        return function () {
          if (--totalFunctions === 0) {
            if (callback) {
@@ -305,6 +307,15 @@ function versions(callback) {
      })();

      try {
+        exec('openssl version', function (error, stdout) {
+          if (!error) {
+            let openssl_string = stdout.toString().split('\n')[0].trim();
+            let openssl = openssl_string.split(' ');
+            result.systemOpenssl = openssl.length > 0 ? openssl[1] : openssl[0];
+            result.systemOpensslLib = openssl.length > 0 ? openssl[0] : 'openssl';
+          }
+          functionProcessed();
+        });
        exec('npm -v', function (error, stdout) {
          if (!error) {
            result.npm = stdout.toString().split('\n')[0];
@@ -313,7 +324,10 @@ function versions(callback) {
        });
        exec('pm2 -v', function (error, stdout) {
          if (!error) {
-            result.pm2 = stdout.toString().split('\n')[0].trim();
+            let pm2 = stdout.toString().split('\n')[0].trim();
+            if (!pm2.startsWith('[PM2]')) {
+              result.pm2 = pm2;
+            }
          }
          functionProcessed();
        });