Added env variable to hopefully pass functional tests

Henry Mollman · Henry Mollman · commit a96af0e769a5 · 2016-10-11T10:23:49.000-07:00
diff --git a/configs/.env.development b/configs/.env.development
@@ -2,6 +2,7 @@ ASSERT_HTTPS=false
 AWS_ACCESS_KEY_ID=AKIAJXF6CNCWBWNX7JZQ
 AWS_SECRET_ACCESS_KEY=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
 CONTAINER_STOP_LIMIT=10
+DB_CONNECTION_TIMEOUT=10000
 DOCKER_IMAGE_BUILDER_CACHE=/git-cache
 DOMAIN=localhost:3001
 FULL_API_DOMAIN=http://localhost:3030
diff --git a/configs/.env.production-delta b/configs/.env.production-delta
@@ -1,4 +1,5 @@
 CONTAINER_STOP_LIMIT=10
+DB_CONNECTION_TIMEOUT=10000
 DOCKER_IMAGE_BUILDER_CACHE=/git-cache
 DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache
 DOMAIN=runnable.io
diff --git a/configs/.env.production-epsilon b/configs/.env.production-epsilon
@@ -1,6 +1,7 @@
 ALLOW_ALL_CORS=true
 BUNYAN_LOG_USE_SRC=true
 CONTAINER_STOP_LIMIT=10
+DB_CONNECTION_TIMEOUT=10000
 DOCKER_IMAGE_BUILDER_CACHE=/git-cache
 DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache
 DOMAIN=runnable-beta.com
diff --git a/configs/.env.production-gamma b/configs/.env.production-gamma
@@ -1,6 +1,7 @@
 ALLOW_ALL_CORS=true
 BUNYAN_LOG_USE_SRC=true
 CONTAINER_STOP_LIMIT=10
+DB_CONNECTION_TIMEOUT=10000
 DOCKER_IMAGE_BUILDER_CACHE=/git-cache
 DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache
 DOMAIN=runnable-gamma.com
diff --git a/configs/.env.staging b/configs/.env.staging
@@ -3,6 +3,7 @@ AWS_ACCESS_KEY_ID=AKIAJXF6CNCWBWNX7JZQ
 AWS_SECRET_ACCESS_KEY=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
 BUNYAN_BATCH_LOG_COUNT=5
 DATADOG_HOST=datadog-staging-codenow.runnableapp.com
+DB_CONNECTION_TIMEOUT=10000
 DEBUG=runnable-api:docker*,api:worker*,hermes*
 DOCKER_IMAGE_BUILDER_CACHE=/git-cache
 DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache
diff --git a/configs/.env.test b/configs/.env.test
@@ -9,6 +9,7 @@ BUNYAN_LOG_USE_SRC=true
 CONTAINER_STOP_LIMIT=10
 COOKIE_SECRET=\$up3r,$3<r3t
 CREAM_HOST=localhost:9879
+DB_CONNECTION_TIMEOUT=60000
 DEFAULT_PAGE_LIMIT=25
 DOMAIN=runnable.io
 FULL_API_DOMAIN=http://localhost:3031
diff --git a/lib/models/mongo/mongoose-control.js b/lib/models/mongo/mongoose-control.js
@@ -84,5 +84,5 @@ mongooseControl._exitIfFailedToReconnect = function () {
       log.fatal({message: 'Exiting nodejs process due to mongodb connection failure'})
       process.exit(1)
     }
-  }, 10000)
+  }, process.env.DB_CONNECTION_TIMEOUT)
 }
diff --git a/unit/models/mongo/mongoose-control.js b/unit/models/mongo/mongoose-control.js
@@ -167,7 +167,7 @@ describe('mongoose-control', function () {
         mongooseControl._exitIfFailedToReconnect()
         clock.tick(1000)
         sinon.assert.notCalled(process.exit)
-        clock.tick(10000)
+        clock.tick(60000)
         sinon.assert.calledOnce(process.exit)
         done()
       })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`CONTAINER_STOP_LIMIT=10`
	`2`	`+DB_CONNECTION_TIMEOUT=10000`
`2`	`3`	`DOCKER_IMAGE_BUILDER_CACHE=/git-cache`
`3`	`4`	`DOCKER_IMAGE_BUILDER_LAYER_CACHE=/layer-cache`
`4`	`5`	`DOMAIN=runnable.io`
Original file line number	Diff line number	Diff line change
`@@ -84,5 +84,5 @@ mongooseControl._exitIfFailedToReconnect = function () {`
`84`	`84`	`log.fatal({message: 'Exiting nodejs process due to mongodb connection failure'})`
`85`	`85`	`process.exit(1)`
`86`	`86`	`}`
`87`		`- }, 10000)`
	`87`	`+ }, process.env.DB_CONNECTION_TIMEOUT)`
`88`	`88`	`}`