hotfix-remove-docker-timeout

CodeNow · Dec 29, 2014 · fd3f518 · fd3f518
1 parent d73c55e
commit fd3f518
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/configs/.env b/configs/.env
@@ -20,7 +20,6 @@ HASHIDS_LENGTH=6
 DOCKER_IMAGE_BUILDER_NAME="runnable/image-builder"
 DOCKER_IMAGE_BUILDER_VERSION="d1.3.1-v1.4.3"
 DOCKER_IMAGE_BUILDER_CACHE="/tmp"
-DOCKER_TIMEOUT=5000
 BUILD_END_TIMEOUT=100
 DATADOG_HOST="localhost"
 DATADOG_PORT=8125

diff --git a/lib/models/apis/docker.js b/lib/models/apis/docker.js
@@ -26,8 +26,7 @@ function Docker (dockerHost) {
   this.port = parsed.port || 4243;
   this.docker = dogerode(new Dockerode({
     host: this.dockerHost,
-    port: this.port,
-    timeout: process.env.DOCKER_TIMEOUT
+    port: this.port
   }), {
     service: 'api',
     host: process.env.DATADOG_HOST,

diff --git a/lib/models/datadog/index.js b/lib/models/datadog/index.js
@@ -36,7 +36,7 @@ function captureSocketCount (req, res, next) {
 
   exec('lsof -p ' + process.pid + ' | wc -l', function (err, stdout) {
     if (err) { return; }
-    client.gauge('api.openFiles', parseInt(stdout), 1, ['target:'+key]);
+    client.gauge('api.openFiles', parseInt(stdout), 1, ['pid:'+process.pid]);
   });
 
   next();