Fix issue with MEMCACHE_URL (GoogleCloudPlatform#61) (GoogleCloudPlat…

…form#71) * Fix issue with MEMCACHE_URL * Fix other files as well
stackriot · Sep 19, 2016 · c6d2f4a · c6d2f4a
1 parent 6ba7453
commit c6d2f4a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/4-auth/config.js b/4-auth/config.js
@@ -18,6 +18,10 @@
 var nconf = module.exports = require('nconf');
 var path = require('path');
 
+// Memcache configuration settings
+var MEMCACHE_HOST = process.env.MEMCACHE_PORT_11211_TCP_ADDR || 'localhost';
+var MEMCACHE_PORT = process.env.MEMCACHE_PORT_11211_TCP_PORT || 11211;
+
 nconf
   // 1. Command-line arguments
   .argv()
@@ -55,7 +59,7 @@ nconf
     GCLOUD_PROJECT: '',
 
     // Connection url for the Memcache instance used to store session data
-    MEMCACHE_URL: '127.0.0.1:11211',
+    MEMCACHE_URL: MEMCACHE_HOST + ':' + MEMCACHE_PORT,
 
     // MongoDB connection string
     // https://docs.mongodb.org/manual/reference/connection-string/

diff --git a/5-logging/config.js b/5-logging/config.js
@@ -18,6 +18,10 @@
 var nconf = module.exports = require('nconf');
 var path = require('path');
 
+// Memcache configuration settings
+var MEMCACHE_HOST = process.env.MEMCACHE_PORT_11211_TCP_ADDR || 'localhost';
+var MEMCACHE_PORT = process.env.MEMCACHE_PORT_11211_TCP_PORT || 11211;
+
 nconf
   // 1. Command-line arguments
   .argv()
@@ -55,7 +59,7 @@ nconf
     GCLOUD_PROJECT: '',
 
     // Connection url for the Memcache instance used to store session data
-    MEMCACHE_URL: '127.0.0.1:11211',
+    MEMCACHE_URL: MEMCACHE_HOST + ':' + MEMCACHE_PORT,
 
     // MongoDB connection string
     // https://docs.mongodb.org/manual/reference/connection-string/

diff --git a/6-pubsub/config.js b/6-pubsub/config.js
@@ -18,6 +18,10 @@
 var nconf = module.exports = require('nconf');
 var path = require('path');
 
+// Memcache configuration settings
+var MEMCACHE_HOST = process.env.MEMCACHE_PORT_11211_TCP_ADDR || 'localhost';
+var MEMCACHE_PORT = process.env.MEMCACHE_PORT_11211_TCP_PORT || 11211;
+
 nconf
   // 1. Command-line arguments
   .argv()
@@ -57,7 +61,7 @@ nconf
     GCLOUD_PROJECT: '',
 
     // Connection url for the Memcache instance used to store session data
-    MEMCACHE_URL: '127.0.0.1:11211',
+    MEMCACHE_URL: MEMCACHE_HOST + ':' + MEMCACHE_PORT,
 
     // MongoDB connection string
     // https://docs.mongodb.org/manual/reference/connection-string/

diff --git a/7-gce/config.js b/7-gce/config.js
@@ -18,6 +18,10 @@
 var nconf = module.exports = require('nconf');
 var path = require('path');
 
+// Memcache configuration settings
+var MEMCACHE_HOST = process.env.MEMCACHE_PORT_11211_TCP_ADDR || 'localhost';
+var MEMCACHE_PORT = process.env.MEMCACHE_PORT_11211_TCP_PORT || 11211;
+
 nconf
   // 1. Command-line arguments
   .argv()
@@ -57,7 +61,7 @@ nconf
     GCLOUD_PROJECT: '',
 
     // Connection url for the Memcache instance used to store session data
-    MEMCACHE_URL: '127.0.0.1:11211',
+    MEMCACHE_URL: MEMCACHE_HOST + ':' + MEMCACHE_PORT,
 
     // MongoDB connection string
     // https://docs.mongodb.org/manual/reference/connection-string/