From 5d0f398bf74bf8505989cbc495ef587372cc3e1e Mon Sep 17 00:00:00 2001 From: Zaid Abdulla Date: Mon, 28 Jul 2014 18:44:36 +0300 Subject: [PATCH] Using a single connection URL to configure MongoDB connection. --- config/config-sample.json | 3 +-- lib/config.coffee | 12 +----------- lib/db.coffee | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/config/config-sample.json b/config/config-sample.json index 4505495..0105624 100644 --- a/config/config-sample.json +++ b/config/config-sample.json @@ -1,6 +1,5 @@ { - "DATABASE_NAME" : "genieacs", - "MONGODB_SOCKET" : "/tmp/mongodb-27017.sock", + "MONGODB_CONNECTION_URL" : "mongodb://localhost/genieacs", "REDIS_SOCKET" : "6379", "ACS_INTERFACE" : "0.0.0.0", "ACS_PORT" : 7547, diff --git a/lib/config.coffee b/lib/config.coffee index cddea7f..64ce694 100644 --- a/lib/config.coffee +++ b/lib/config.coffee @@ -15,7 +15,7 @@ # along with GenieACS. If not, see . ### -exports.DATABASE_NAME = 'genieacs' +exports.MONGODB_CONNECTION_URL = 'mongodb://localhost/genieacs' exports.REDIS_DB = 0 exports.ACS_PORT = 7547 # CWMP port as assigned by IANA exports.ACS_HTTPS_PORT = 7548 @@ -42,16 +42,6 @@ exports.SESSION_TIMEOUT = 30 exports.GET_PARAMETER_NAMES_DEPTH_THRESHOLD = 0 exports.TASK_PARAMETERS_BATCH_SIZE = 32 -exports.MONGODB_OPTIONS = { - db : { - w : 1 - wtimeout : 60000 - } - server : { - auto_reconnect : true - } -} - # load configuration c = require('../config/config') for k, v of c diff --git a/lib/db.coffee b/lib/db.coffee index c76835f..24fbe71 100644 --- a/lib/db.coffee +++ b/lib/db.coffee @@ -29,7 +29,7 @@ objectsCollection = null connect = (callback) -> callbackCounter = 6 - mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", config.MONGODB_OPTIONS, (err, db) -> + mongodb.MongoClient.connect(config.MONGODB_CONNECTION_URL, {db:{w:1},server:{autoReconnect:true}}, (err, db) -> return callback(err) if err exports.mongoDb = db db.collection('tasks', (err, collection) ->