update config

Dockerfile

@@ -8,6 +8,8 @@ RUN cnpm install
 
 EXPOSE 6060
 
+ENV NODE_ENV=production
+
 ENTRYPOINT babel-node server.js
 
 

Dockerfile_qa

@@ -0,0 +1,15 @@
+FROM server:2.0
+
+COPY . ConstructionCost
+
+WORKDIR ConstructionCost
+
+RUN cnpm install
+
+EXPOSE 6060
+
+ENV NODE_ENV=qa
+
+ENTRYPOINT babel-node server.js
+
+

config/config.js

@@ -1,24 +1,16 @@
 module.exports = {
-    current: {server: "192.168.1.184", port: "60666"},
+    current: {server: "192.168.1.184", port: "60666",redis:{server:'192.168.1.184',port:'6379',pwd:'smartCost'}},
     local: {server: "localhost", port: "27017"},
     qa: {server: "192.168.1.184", port: "60666"},
     prod: {server: "", port: ""},
     redis_local:{server:'127.0.0.1',port:'6379',pwd:'smartCost'},
     redis_qa:{server:'192.168.1.184',port:'6379',pwd:'smartCost'},
-    setToLocalDb: function() {
-        var me = this;
-        me.current.server = me.local.server;
-        me.current.port = me.local.port;
-    },
-    setToQaDb: function() {
-        var me = this;
-        me.current.server = me.qa.server;
-        me.current.port = me.qa.port;
-    },
-    setToProdDb: function() {
-        var me = this;
-        me.current.server = me.prod.server;
-        me.current.port = me.prod.port;
+    setupDb:function (env="local") {
+        let me = this;
+        let serverInfo = me[env];
+        me.current.server = serverInfo.server;
+        me.current.port = serverInfo.port;
+        me.current.redis=me["redis_"+env];
     },
     options:{
             "user": "",
@@ -31,6 +23,5 @@ module.exports = {
                 "connectTimeoutMS": 10000
                 }
             }
-
         }
 }

config/redis.js

@@ -4,11 +4,12 @@
 
 let Redis = require('ioredis'),
     config=require('./config'),
+    redisConfig = config.current.redis;
     redis = new Redis({
-        port: config.redis_qa.port,          // Redis port
-        host: config.redis_qa.server,   // Redis host
+        port: redisConfig.port,          // Redis port
+        host: redisConfig.server,   // Redis host
         family: 4,           // 4 (IPv4) or 6 (IPv6)
-        password:config.redis_qa.pwd,
+        password:redisConfig.pwd,
         db: 0
     });
 let client={};

server.js

@@ -3,8 +3,7 @@ let express = require('express');
 let config = require("./config/config.js");
 let fileUtils = require("./modules/common/fileUtils");
 let dbm = require("./config/db/db_manager");
-//config.setToLocalDb();
-config.setToQaDb();
+config.setupDb(process.env.NODE_ENV);
 
 let path = require('path');
 let session = require('express-session');