@certik/skynet 0.10.30 → 0.10.33

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.10.33
+
+- Fixed api monitor error messages
+
+## 0.10.32
+
+- Changed deploy to add a SKYNET_DEPLOYED_AT variable to ensure new deployment would always be triggered in nomad
+
+## 0.10.31
+
+- `api` app bug fix
+
 ## 0.10.30
 
 - Changed `api` app deployment to service type for rolling updates

package/api.js

@@ -110,7 +110,7 @@ ${getSelectorDesc(selector)}
 
   const { verbose, ...selectorFlags } = cli.flags;
 
-  if (!serve.count || serve.count === 1) {
+  if (!serve.instances || serve.instances === 1) {
     await useLock({ name: getJobName(name, selectorFlags), ttl: 50, verbose });
   }
 

package/app.js

@@ -609,13 +609,22 @@ function api({ name, routes, serve, beforeListen, env = {}, region = "us-east-1"
     func: async () => {
       const errors = [];
 
-      const url = `http://localhost:9999${serve.prefix}/`;
-      const res = await fetch(url);
+      try {
+        const url = `http://localhost:9999${serve.prefix}/`;
+        const res = await fetch(url);
+
+        if (!res.ok) {
+          errors.push({
+            type: ERROR_LEVEL.ERROR,
+            message: `service ${name} is unhealthy`,
+          });
+        }
+      } catch (fetchErr) {
+        console.log(`error fetching ${url}`, fetchErr);
 
-      if (!res.ok) {
         errors.push({
           type: ERROR_LEVEL.ERROR,
-          message: `service ${name} is not healthy`,
+          message: `service ${name} is unhealthy`,
         });
       }
 

package/deploy.js

@@ -374,6 +374,13 @@ function createModeDeploy({
       delta: { cpu: deltaCpu, mem: deltaMem },
     };
 
+    // added an always changing env var
+    // to ensure new deployment always triggers
+    env = {
+      ...env,
+      SKYNET_DEPLOYED_AT: new Date().toISOString(),
+    };
+
     // by default use delta cpu/mem settings
     const { cpu, mem } = modeResouces[mode] || modeResouces.delta;
 
@@ -554,6 +561,13 @@ function createDeploy({
       cron = cmdSchedule;
     }
 
+    // added an always changing env var
+    // to ensure new deployment always triggers
+    env = {
+      ...env,
+      SKYNET_DEPLOYED_AT: new Date().toISOString(),
+    };
+
     const nomadJobDefinition = genConfig({
       jobName,
       cron: INTERVAL_ALIASES[cron] || cron,

package/monitor.js

@@ -132,7 +132,7 @@ ${
           } catch (err) {
             console.log(`[MONITOR] got error in check`, err);
 
-            return [`${err.message}`];
+            return [{ type: ERROR_LEVEL.ERROR, message: `${err.message}` }];
           }
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.30",
+  "version": "0.10.33",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",