diff --git a/src/docker.js b/src/docker.js index 04a59c5bb..77d4f1829 100644 --- a/src/docker.js +++ b/src/docker.js @@ -53,12 +53,6 @@ const CLEARVOLUME_CMD = path.join(__dirname, 'scripts/clearvolume.sh'), const DOCKER_SOCKET_PATH = '/var/run/docker.sock'; const gConnection = new Docker({ socketPath: DOCKER_SOCKET_PATH }); -function debugApp(app) { - assert(typeof app === 'object'); - - debug(app.fqdn + ' ' + util.format.apply(util, Array.prototype.slice.call(arguments, 1))); -} - function testRegistryConfig(auth, callback) { assert.strictEqual(typeof auth, 'object'); assert.strictEqual(typeof callback, 'function'); @@ -332,8 +326,6 @@ function createSubcontainer(app, name, cmd, options, callback) { containerOptions = _.extend(containerOptions, options); - debugApp(app, 'Creating container for %s', app.manifest.dockerImage); - gConnection.createContainer(containerOptions, function (error, container) { if (error) return callback(new BoxError(BoxError.DOCKER_ERROR, error)); @@ -413,8 +405,6 @@ function deleteContainer(containerId, callback) { assert(!containerId || typeof containerId === 'string'); assert.strictEqual(typeof callback, 'function'); - debug('deleting container %s', containerId); - if (containerId === null) return callback(null); var container = gConnection.getContainer(containerId); @@ -459,8 +449,6 @@ function stopContainers(appId, callback) { assert.strictEqual(typeof appId, 'string'); assert.strictEqual(typeof callback, 'function'); - debug('Stopping containers of %s', appId); - gConnection.listContainers({ all: 1, filters: JSON.stringify({ label: [ 'appId=' + appId ] }) }, function (error, containers) { if (error) return callback(new BoxError(BoxError.DOCKER_ERROR, error)); diff --git a/src/scheduler.js b/src/scheduler.js index f1a83bb0d..32de05b7e 100644 --- a/src/scheduler.js +++ b/src/scheduler.js @@ -143,8 +143,6 @@ function runTask(appId, taskName, callback) { callback = callback || NOOP_CALLBACK; - debug(`runTask: running task ${taskName} of ${appId}`); - apps.get(appId, function (error, app) { if (error) return callback(error); @@ -164,14 +162,10 @@ function runTask(appId, taskName, callback) { } } - debug(`runTask: removing any old task ${taskName} of app ${app.fqdn}`); - killContainer(containerName, function (error) { if (error) return callback(error); const cmd = gState[appId].schedulerConfig[taskName].command; - debug(`runTask: starting task ${taskName} of app ${app.fqdn} with cmd ${cmd}`); - // NOTE: if you change container name here, fix addons.js to return correct container names docker.createSubcontainer(app, containerName, [ '/bin/sh', '-c', cmd ], { } /* options */, function (error, container) { if (error) return callback(error);