mpana/copilot
1
0
Fork 0
mirror of https://github.com/yldio/copilot.git synced 2024-11-28 06:00:06 +02:00
Code Issues Releases Wiki Activity

fix: only get a single dg for id

Browse Source
This commit is contained in:
Wyatt Preul 2017-09-13 13:30:45 -05:00 committed by Sérgio Ramos
parent 1fe36f0e1b
commit e70d80425a
6 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker-compose.yml
View File

@ -66,7 +66,7 @@ frontend:
# BACKEND
#############################################################################
api:
image: joyent/copilot-api:1.8.6
image: joyent/copilot-api:1.8.8
mem_limit: 512m
links:
- consul:consul

2
docker/api/package.json
View File

@ -21,7 +21,7 @@
"joi": "^10.6.0",
"joyent-cp-gql-schema": "^1.7.0",
"piloted": "^3.1.1",
"portal-api": "^1.8.6",
"portal-api": "^1.8.8",
"toppsy": "^1.1.0",
"triton": "^5.2.0"
}

7
docker/api/server.js
View File

@ -119,12 +119,19 @@ const startServer = function ({ docker, rethink }) {
const handlerError = function (err) {
if (err) {
console.error(err);
console.error(err.stack);
process.exit(1);
}
};
process.on('uncaughtException', (err) => {
console.error(err);
console.error(err.stack);
});
process.on('unhandledRejection', (err) => {
console.error(err);
console.error(err.stack);
});
loadConfig();

66
packages/portal-api/lib/data/index.js
View File

@ -460,6 +460,16 @@ class Data extends EventEmitter {
getDeploymentGroup (query, cb) {
query = query || {};
if (query.id) {
return this._db.deployment_groups.get(query.id, (err, deploymentGroup) => {
if (err) {
return cb(err);
}
cb(null, Transform.fromDeploymentGroup(this._getDeploymentGroupFns(deploymentGroup)));
});
}
this._db.deployment_groups.query(query, (err, deploymentGroups) => {
if (err) {
return cb(err);
@ -487,16 +497,16 @@ class Data extends EventEmitter {
VAsync.parallel({
funcs: [
(cb) => {
(next) => {
if (!res.dg) {
return cb();
return next();
}
this._db.deployment_groups.remove({ id }, cb);
this._db.deployment_groups.remove({ id }, next);
},
(cb) => {
(next) => {
if (!res.services) {
return cb();
return next();
}
VAsync.forEachParallel({
@ -504,11 +514,11 @@ class Data extends EventEmitter {
func: ({ id }, next) => {
this._db.services.remove({ id }, next);
}
});
}, next);
},
(cb) => {
(next) => {
if (!res.instances) {
return cb();
return next();
}
VAsync.forEachParallel({
@ -516,67 +526,65 @@ class Data extends EventEmitter {
func: ({ id }, next) => {
this._db.instances.remove({ id }, next);
}
});
}, next);
},
(cb) => {
(next) => {
VAsync.forEachParallel({
inputs: res.versions,
func: ({ id }, next) => {
this._db.versions.remove({ id }, next);
}
});
}, next);
},
(cb) => {
(next) => {
VAsync.forEachParallel({
inputs: res.manifests,
func: ({ id }, next) => {
this._db.manifests.remove({ id }, next);
}
});
}, next);
}
]
}, (err) => {
cb(err, res.cb);
});
}, cb);
};
VAsync.parallel({
funcs: [
(cb) => {
(next) => {
this.getDeploymentGroup({ id }, (err, dg) => {
if (internals.isNotFound(err)) {
return cb(null, {});
return next(null, {});
}
cb(err, { dg });
next(err, { dg });
});
},
(cb) => {
(next) => {
this.getServices({ deploymentGroupId: id }, (err, services) => {
if (internals.isNotFound(err)) {
return cb(null, {});
return next(null, {});
}
cb(err, { services });
next(err, { services });
});
},
(cb) => {
(next) => {
this.getInstances({ deploymentGroupId: id }, (err, instances) => {
if (internals.isNotFound(err)) {
return cb(null, {});
return next(null, {});
}
cb(err, { instances });
next(err, { instances });
});
},
(cb) => {
(next) => {
this.getVersions({ deploymentGroupId: id }, (err, versions) => {
cb(err, { versions });
next(err, { versions });
});
},
(cb) => {
(next) => {
this.getManifests({ deploymentGroupId: id }, (err, manifests) => {
cb(err, { manifests });
next(err, { manifests });
});
}
]

2
packages/portal-api/package.json
View File

@ -1,6 +1,6 @@
{
"name": "portal-api",
"version": "1.8.6",
"version": "1.8.8",
"description": "",
"main": "./lib/index.js",
"scripts": {

2
triton-compose.yml
View File

@ -81,7 +81,7 @@ frontend:
# BACKEND
#############################################################################
api:
image: joyent/copilot-api:1.8.6
image: joyent/copilot-api:1.8.8
mem_limit: 1g
expose:
- 3000