From 3c8b2b0c8fdb88d8da424120c7aae57bffd2b6e5 Mon Sep 17 00:00:00 2001 From: Wyatt Preul Date: Mon, 18 Sep 2017 17:00:41 -0500 Subject: [PATCH] fix: no longer ignore successful status checks --- docker-compose.yml | 4 +--- docker/api/package.json | 6 +++--- local-compose.yml | 2 +- packages/cp-gql-schema/package.json | 2 +- packages/portal-api/lib/watch/container-pilot.js | 2 +- packages/portal-api/package.json | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7313f4ef..6dfa7d60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -72,7 +72,7 @@ frontend: # BACKEND ############################################################################# api: - image: joyent/copilot-api:1.8.15 + image: joyent/copilot-api:1.8.16 mem_limit: 1g expose: - 3000 @@ -81,8 +81,6 @@ api: - _env environment: - PORT=3000 - ports: - - "8080:8080" restart: always # Docker-compose wrapper diff --git a/docker/api/package.json b/docker/api/package.json index 09d518d4..57e9858e 100644 --- a/docker/api/package.json +++ b/docker/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "1.8.15", + "version": "1.8.16", "description": "", "main": "./server.js", "scripts": { @@ -19,9 +19,9 @@ "hapi": "^16.6.0", "hoek": "^4.1.1", "joi": "^10.6.0", - "joyent-cp-gql-schema": "^1.7.0", + "joyent-cp-gql-schema": "^1.8.0", "piloted": "^3.1.1", - "portal-api": "^1.8.15", + "portal-api": "^1.8.16", "toppsy": "^1.1.0", "triton": "^5.2.0" } diff --git a/local-compose.yml b/local-compose.yml index 7f384a20..1f30abdd 100644 --- a/local-compose.yml +++ b/local-compose.yml @@ -66,7 +66,7 @@ frontend: # BACKEND ############################################################################# api: - image: joyent/copilot-api:1.8.15 + image: joyent/copilot-api:1.8.16 mem_limit: 512m links: - consul:consul diff --git a/packages/cp-gql-schema/package.json b/packages/cp-gql-schema/package.json index f2cb2458..f0b09b42 100644 --- a/packages/cp-gql-schema/package.json +++ b/packages/cp-gql-schema/package.json @@ -1,6 +1,6 @@ { "name": "joyent-cp-gql-schema", - "version": "1.7.0", + "version": "1.8.0", "license": "MPL-2.0", "repository": "github:yldio/copilot", "main": "index.js", diff --git a/packages/portal-api/lib/watch/container-pilot.js b/packages/portal-api/lib/watch/container-pilot.js index a1936dd8..0748ad6f 100644 --- a/packages/portal-api/lib/watch/container-pilot.js +++ b/packages/portal-api/lib/watch/container-pilot.js @@ -167,7 +167,7 @@ module.exports = class ContainerPilotWatcher extends Events { func: fetchStatus, inputs: machine.ips }, (err, results) => { - if (err || !results.successes || !results.successes.length) { + if (err && (!results.successes || !results.successes.length)) { return cb(err); } diff --git a/packages/portal-api/package.json b/packages/portal-api/package.json index d34a1a67..7f9965ff 100644 --- a/packages/portal-api/package.json +++ b/packages/portal-api/package.json @@ -1,6 +1,6 @@ { "name": "portal-api", - "version": "1.8.15", + "version": "1.8.16", "description": "", "main": "./lib/index.js", "scripts": { @@ -39,7 +39,7 @@ "graphi": "^3.0.0", "hasha": "^3.0.0", "hoek": "^4.2.0", - "joyent-cp-gql-schema": "^1.7.0", + "joyent-cp-gql-schema": "^1.8.0", "lodash.find": "^4.6.0", "lodash.flatten": "^4.4.0", "lodash.get": "^4.4.2",