Merge pull request #9 from FlowzPlatform/develop

mongodb connction with reconnect option

Author: chiragob

uploader.js

@@ -1,10 +1,32 @@
 let mongoose = require('mongoose')
 const extend = require('util')._extend;
-mongoose.set('debug', false);
+mongoose.set('debug', true);
 let ObjectId = require('mongoose').Types.ObjectId
-
 const config = require('config')
 
+let mongoDBConnection = config.get('mongoDBConnection')
+
+let mongoURL = mongoDBConnection.URL
+if (process.env.mongoURL !== undefined && process.env.mongoURL !== '') {
+  mongoURL = process.env.mongoURL
+}
+
+// console.log("==========", mongoURL)
+// `Job` here has essentially the same API as JobCollection on Meteor.
+// In fact, job-collection is built on top of the 'meteor-job' npm package!
+mongoose.Promise = global.Promise
+// Connect to the beerlocker MongoDB
+// mongoose.connect('mongodb://localhost:3001/meteor');
+mongoose.connect(mongoURL, {autoReconnect : true, bufferMaxEntries: 0, reconnectInterval: 1000, poolSize: 5, reconnectTries: 30, keepAlive: 800000, connectTimeoutMS: 800000}, function (err, db) {
+  if (err) {
+    console.log('error.........', err)
+  }
+})
+// mongoose.connect('mongodb://obdev:123456@ds133311.mlab.com:33311/closeoutpromo');
+let ObjSchema = mongoose.Schema
+
+
+
 let elasticsearch = require('elasticsearch')
 let rpRequest = require('request-promise')
 let http = require('http')
@@ -13,7 +35,6 @@ let https = require('https')
 const uuidV1 = require('uuid/v1');
 let ESuserData = null
 let Promise = require('es6-promise').Promise
-let ObjSchema =  mongoose.Schema;
 
 let rethink = require('rethinkdb')
 let rethinkDBConnection = extend({}, config.get('rethinkDBConnection'))
@@ -46,7 +67,7 @@ let activeSummary = []
 let ESClient = new elasticsearch.Client({
   host: esUrl,
   requestTimeout: 100000
-//  ,log: 'trace'
+// ,log: 'trace'
 })
 let uploadedRecord = 0
 
@@ -337,7 +358,7 @@ async function makeNewPreviewUser (objWorkJob) {
 
 
 function getUserDataFromMongo(userid) {
-  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': 'users'})
+  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false,bufferCommands: false, 'collection': 'users'})
   let modelOBUsers
   let modelName = 'mdlUsers'
   if (mongoose.models && mongoose.models[modelName]){
@@ -1054,7 +1075,7 @@ function getUserNewVersion (ESUser) {
 
 function makeDynamicCollectionObj (collectionName) {
   collectionName = collectionName.charAt(0).toUpperCase() + collectionName.slice(1).toLowerCase()
-  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': collectionPrefix + collectionName})
+  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, bufferCommands: false, 'collection': collectionPrefix + collectionName})
   let modelName = 'mdl'+collectionName
   if (mongoose.models && mongoose.models[modelName]){
     return mongoose.models[modelName]
@@ -1065,7 +1086,7 @@ function makeDynamicCollectionObj (collectionName) {
 
 function makeDynamicCollectionObjWithoutPrefix (collectionName) {
   // collectionName = collectionName.charAt(0).toUpperCase() + collectionName.slice(1).toLowerCase()
-  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': collectionName})
+  let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, bufferCommands: false, 'collection': collectionName})
   let modelName = 'mdl'+collectionName
   if (mongoose.models && mongoose.models[modelName]){
     return mongoose.models[modelName]
@@ -1193,7 +1214,7 @@ function convertStringToArray (str, seprater) {
 
 // to update user job queue process status to import_completed
 function updateJobQueueStatus (objWorkJob) {
-  let objJobMaster = new ObjSchema({_id: String}, {strict: false, 'collection': 'uploaderJobMaster'})
+  let objJobMaster = new ObjSchema({_id: String}, {strict: false, bufferCommands: false, 'collection': 'uploaderJobMaster'})
   let mdlobjJobMaster = null
   if (mongoose.models && mongoose.models.objJobMaster) {
     mdlobjJobMaster = mongoose.models.objJobMaster

uploaderworker.js

@@ -2,8 +2,6 @@ const rfqQueue = require('rethinkdb-job-queue')
 const extend = require('util')._extend;
 const config = require('config')
 let rethink = require('rethinkdb')
-let mongoose = require('mongoose')
-mongoose.set('debug', true)
 
 let connctionOption = extend({}, config.get('rethinkDBConnection'))
 if (process.env.rdbHost !== undefined && process.env.rdbHost !== '') {
@@ -15,30 +13,6 @@ if (process.env.rdbPort !== undefined && process.env.rdbPort !== '') {
 
 let doJob = require('./uploader.js')
 
-let mongoDBConnection = config.get('mongoDBConnection')
-
-let mongoURL = mongoDBConnection.URL
-if (process.env.mongoURL !== undefined && process.env.mongoURL !== '') {
-  mongoURL = process.env.mongoURL
-}
-
-// console.log("==========", mongoURL)
-// `Job` here has essentially the same API as JobCollection on Meteor.
-// In fact, job-collection is built on top of the 'meteor-job' npm package!
-mongoose.Promise = global.Promise
-// Connect to the beerlocker MongoDB
-// mongoose.connect('mongodb://localhost:3001/meteor');
-mongoose.connect(mongoURL, {reconnectInterval: 5000, poolSize: 5, reconnectTries: 30, keepAlive: 800000, connectTimeoutMS: 800000}, function (err, db) {
-  if (err) {
-    console.log('error.........', err)
-  }
-})
-// mongoose.connect('mongodb://obdev:123456@ds133311.mlab.com:33311/closeoutpromo');
-let ObjSchema = mongoose.Schema
-
-module.exports = mongoose
-module.exports = ObjSchema
-
 let queueOption = {
   name: 'uploaderJobQue'
 }