diff --git a/src/apphealthmonitor.js b/src/apphealthmonitor.js index 846c70a78..01672a13e 100644 --- a/src/apphealthmonitor.js +++ b/src/apphealthmonitor.js @@ -73,7 +73,6 @@ function checkAppHealth(app, callback) { assert.strictEqual(typeof callback, 'function'); if (app.installationState !== apps.ISTATE_INSTALLED || app.runState !== apps.RSTATE_RUNNING) { - debugApp(app, 'skipped. istate:%s rstate:%s', app.installationState, app.runState); return callback(null); } @@ -185,11 +184,9 @@ function processApp(callback) { if (error) console.error(error); const alive = allApps - .filter(function (a) { return a.installationState === apps.ISTATE_INSTALLED && a.runState === apps.RSTATE_RUNNING && a.health === apps.HEALTH_HEALTHY; }) - .map(a => a.fqdn) - .join(', '); + .filter(function (a) { return a.installationState === apps.ISTATE_INSTALLED && a.runState === apps.RSTATE_RUNNING && a.health === apps.HEALTH_HEALTHY; }); - debug(`app health: ${alive.length}alive/${allApps.length - alive.length} dead`); + debug(`app health: ${alive.length} alive / ${allApps.length - alive.length} dead`); callback(null); }); diff --git a/src/docker.js b/src/docker.js index 77d4f1829..4c3d5f055 100644 --- a/src/docker.js +++ b/src/docker.js @@ -343,7 +343,6 @@ function startContainer(containerId, callback) { assert.strictEqual(typeof callback, 'function'); var container = gConnection.getContainer(containerId); - debug('Starting container %s', containerId); container.start(function (error) { if (error && error.statusCode === 404) return callback(new BoxError(BoxError.NOT_FOUND)); @@ -359,7 +358,6 @@ function restartContainer(containerId, callback) { assert.strictEqual(typeof callback, 'function'); var container = gConnection.getContainer(containerId); - debug('Restarting container %s', containerId); container.restart(function (error) { if (error && error.statusCode === 404) return callback(new BoxError(BoxError.NOT_FOUND)); @@ -380,7 +378,6 @@ function stopContainer(containerId, callback) { } var container = gConnection.getContainer(containerId); - debug('Stopping container %s', containerId); var options = { t: 10 // wait for 10 seconds before killing it @@ -389,13 +386,9 @@ function stopContainer(containerId, callback) { container.stop(options, function (error) { if (error && (error.statusCode !== 304 && error.statusCode !== 404)) return callback(new BoxError(BoxError.DOCKER_ERROR, 'Error stopping container:' + error.message)); - debug('Waiting for container ' + containerId); - - container.wait(function (error, data) { + container.wait(function (error/*, data */) { if (error && (error.statusCode !== 304 && error.statusCode !== 404)) return callback(new BoxError(BoxError.DOCKER_ERROR, 'Error waiting on container:' + error.message)); - debug('Container %s stopped with status code [%s]', containerId, data ? String(data.StatusCode) : ''); - return callback(null); }); }); @@ -431,8 +424,6 @@ function deleteContainers(appId, options, callback) { assert.strictEqual(typeof options, 'object'); assert.strictEqual(typeof callback, 'function'); - debug('deleting containers of %s', appId); - let labels = [ 'appId=' + appId ]; if (options.managedOnly) labels.push('isCloudronManaged=true');