@etclabscore/jade-service-runner - npm Package Compare versions

Comparing version 1.0.9 to 1.0.10

build/openrpc.json

 {
     "info": {
         "title": "ServiceRunner",
-        "version": "1.0.9"
+        "version": "1.0.10"
     },
@@ -6,0 +6,0 @@ "methods": [

build/src/cli/commands.js

@@ -7,5 +7,4 @@ "use strict";
 const fs_extra_1 = __importDefault(require("fs-extra"));
-const lodash_1 = __importDefault(require("lodash"));
 const config_1 = require("../lib/config");
-const logging_1 = require("src/lib/logging");
+const logging_1 = require("../lib/logging");
 const __1 = require("../");
@@ -26,3 +25,3 @@ const logger = logging_1.makeLogger("ServiceRunner", "Commands");
     }
-    return { port, dir, test: prog.test && !lodash_1.default.isEmpty(prog.config), extendedConfig };
+    return { port, dir, test: prog.test, extendedConfig };
 };
@@ -29,0 +28,0 @@ const testConfiguration = async (extendedConfig) => {

build/src/cli/index.js

@@ -14,3 +14,3 @@ #!/usr/bin/env node
     .version(version, "-v, --version")
-    .option("-c, --config <configFile>", "JSON file path pointing to a service runner config file", "./build/src/service-runner-config.json")
+    .option("-c, --config <configFile>", "JSON file path pointing to a service runner config file")
     .option("-d, --dir <directory>", "Directory for storing services", "./services")
@@ -25,5 +25,5 @@ .option("-p, --port <port>", "Set port for service runner", "8002")
         logger.error("Could not start service runner.");
-        logger.error(e);
+        logger.debug(e.stack);
     }
 })
     .parse(process.argv);

build/src/lib/config.js

@@ -75,23 +75,29 @@ "use strict";
         const mergedConfig = lodash_1.default.cloneDeep(config);
-        other.services.forEach((svc) => {
-            const serviceIdx = config.services.findIndex((s) => s.name === svc.name);
-            if (serviceIdx > -1) {
-                const service = mergedConfig.services[serviceIdx];
-                svc.environments.every((env) => {
-                    const duplicateEnv = service.environments.find((e) => e.name === env.name);
-                    if (duplicateEnv) {
-                        const errMsg = `Environment name ${duplicateEnv.name} already exists choose unique name`;
-                        throw new Error(errMsg);
-                    }
-                });
-                service.environments = service.environments.concat(svc.environments);
-            }
-            else {
-                mergedConfig.services.push(svc);
-            }
-        });
-        this.validateConfig(mergedConfig);
-        return mergedConfig;
+        try {
+            other.services.forEach((svc) => {
+                const serviceIdx = config.services.findIndex((s) => s.name === svc.name);
+                if (serviceIdx > -1) {
+                    const service = mergedConfig.services[serviceIdx];
+                    svc.environments.every((env) => {
+                        const duplicateEnv = service.environments.find((e) => e.name === env.name);
+                        if (duplicateEnv) {
+                            const errMsg = `Environment name ${duplicateEnv.name} already exists choose unique name`;
+                            throw new Error(errMsg);
+                        }
+                    });
+                    service.environments = service.environments.concat(svc.environments);
+                }
+                else {
+                    mergedConfig.services.push(svc);
+                }
+            });
+            this.validateConfig(mergedConfig);
+            return mergedConfig;
+        }
+        catch (e) {
+            logger.error("Could not parse config");
+            throw e;
+        }
     }
 }
 exports.Config = Config;

build/src/lib/logging.js

@@ -10,5 +10,6 @@ "use strict";
 const winston_1 = __importDefault(require("winston"));
+const LOG_LEVEL = process.env.JADE_DEBUG ? "debug" : "info";
 exports.makeLogger = (service, context) => {
     return winston_1.default.createLogger({
-        transports: new winston_1.default.transports.Console({ format: winston_1.default.format.simple() }),
+        transports: new winston_1.default.transports.Console({ level: LOG_LEVEL, format: winston_1.default.format.simple() }),
         defaultMeta: { service, context },
@@ -15,0 +16,0 @@ exitOnError: false,

CHANGELOG.md

@@ -0,1 +1,9 @@
+## [1.0.10](https://github.com/etclabscore/jade-service-runner/compare/1.0.9...1.0.10) (2019-06-07)
+
+
+### Bug Fixes
+
+* bump openrpc ([9328093](https://github.com/etclabscore/jade-service-runner/commit/9328093))
+* commandline arg passing and error logging ([ed2daab](https://github.com/etclabscore/jade-service-runner/commit/ed2daab))
+
 ## [1.0.9](https://github.com/etclabscore/jade-service-runner/compare/1.0.8...1.0.9) (2019-06-07)
@@ -2,0 +10,0 @@

package.json

 {
   "name": "@etclabscore/jade-service-runner",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "![](https://www.etclabs.org/dist/resources/images/v2/logo-top.png) Supported by [ETC Labs](https://www.etclabs.org/)",
@@ -5,0 +5,0 @@ "bin": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Environment variable access

Supply chain risk

Package accesses environment variables, which may be a sign of credential stuffing or data theft.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

119617

increased by0.41%

Lines of code

2349

increased by0.26%

Worsened metrics

Number of low supply chain risk alerts

10

increased by11.11%

No dependency changes