Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit 01fb3ce

Browse files
authored
Merge pull request #9 from FlowzPlatform/develop
mongodb connction with reconnect option
2 parents 387416e + 539d521 commit 01fb3ce

File tree

2 files changed

+29
-34
lines changed

2 files changed

+29
-34
lines changed

uploader.js

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,32 @@
11
let mongoose = require('mongoose')
22
const extend = require('util')._extend;
3-
mongoose.set('debug', false);
3+
mongoose.set('debug', true);
44
let ObjectId = require('mongoose').Types.ObjectId
5-
65
const config = require('config')
76

7+
let mongoDBConnection = config.get('mongoDBConnection')
8+
9+
let mongoURL = mongoDBConnection.URL
10+
if (process.env.mongoURL !== undefined && process.env.mongoURL !== '') {
11+
mongoURL = process.env.mongoURL
12+
}
13+
14+
// console.log("==========", mongoURL)
15+
// `Job` here has essentially the same API as JobCollection on Meteor.
16+
// In fact, job-collection is built on top of the 'meteor-job' npm package!
17+
mongoose.Promise = global.Promise
18+
// Connect to the beerlocker MongoDB
19+
// mongoose.connect('mongodb://localhost:3001/meteor');
20+
mongoose.connect(mongoURL, {autoReconnect : true, bufferMaxEntries: 0, reconnectInterval: 1000, poolSize: 5, reconnectTries: 30, keepAlive: 800000, connectTimeoutMS: 800000}, function (err, db) {
21+
if (err) {
22+
console.log('error.........', err)
23+
}
24+
})
25+
// mongoose.connect('mongodb://obdev:123456@ds133311.mlab.com:33311/closeoutpromo');
26+
let ObjSchema = mongoose.Schema
27+
28+
29+
830
let elasticsearch = require('elasticsearch')
931
let rpRequest = require('request-promise')
1032
let http = require('http')
@@ -13,7 +35,6 @@ let https = require('https')
1335
const uuidV1 = require('uuid/v1');
1436
let ESuserData = null
1537
let Promise = require('es6-promise').Promise
16-
let ObjSchema = mongoose.Schema;
1738

1839
let rethink = require('rethinkdb')
1940
let rethinkDBConnection = extend({}, config.get('rethinkDBConnection'))
@@ -46,7 +67,7 @@ let activeSummary = []
4667
let ESClient = new elasticsearch.Client({
4768
host: esUrl,
4869
requestTimeout: 100000
49-
// ,log: 'trace'
70+
// ,log: 'trace'
5071
})
5172
let uploadedRecord = 0
5273

@@ -337,7 +358,7 @@ async function makeNewPreviewUser (objWorkJob) {
337358

338359

339360
function getUserDataFromMongo(userid) {
340-
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': 'users'})
361+
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false,bufferCommands: false, 'collection': 'users'})
341362
let modelOBUsers
342363
let modelName = 'mdlUsers'
343364
if (mongoose.models && mongoose.models[modelName]){
@@ -1054,7 +1075,7 @@ function getUserNewVersion (ESUser) {
10541075

10551076
function makeDynamicCollectionObj (collectionName) {
10561077
collectionName = collectionName.charAt(0).toUpperCase() + collectionName.slice(1).toLowerCase()
1057-
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': collectionPrefix + collectionName})
1078+
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, bufferCommands: false, 'collection': collectionPrefix + collectionName})
10581079
let modelName = 'mdl'+collectionName
10591080
if (mongoose.models && mongoose.models[modelName]){
10601081
return mongoose.models[modelName]
@@ -1065,7 +1086,7 @@ function makeDynamicCollectionObj (collectionName) {
10651086

10661087
function makeDynamicCollectionObjWithoutPrefix (collectionName) {
10671088
// collectionName = collectionName.charAt(0).toUpperCase() + collectionName.slice(1).toLowerCase()
1068-
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, 'collection': collectionName})
1089+
let ObjMain = new ObjSchema({_id: 'string'}, {strict: false, bufferCommands: false, 'collection': collectionName})
10691090
let modelName = 'mdl'+collectionName
10701091
if (mongoose.models && mongoose.models[modelName]){
10711092
return mongoose.models[modelName]
@@ -1193,7 +1214,7 @@ function convertStringToArray (str, seprater) {
11931214

11941215
// to update user job queue process status to import_completed
11951216
function updateJobQueueStatus (objWorkJob) {
1196-
let objJobMaster = new ObjSchema({_id: String}, {strict: false, 'collection': 'uploaderJobMaster'})
1217+
let objJobMaster = new ObjSchema({_id: String}, {strict: false, bufferCommands: false, 'collection': 'uploaderJobMaster'})
11971218
let mdlobjJobMaster = null
11981219
if (mongoose.models && mongoose.models.objJobMaster) {
11991220
mdlobjJobMaster = mongoose.models.objJobMaster

uploaderworker.js

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ const rfqQueue = require('rethinkdb-job-queue')
22
const extend = require('util')._extend;
33
const config = require('config')
44
let rethink = require('rethinkdb')
5-
let mongoose = require('mongoose')
6-
mongoose.set('debug', true)
75

86
let connctionOption = extend({}, config.get('rethinkDBConnection'))
97
if (process.env.rdbHost !== undefined && process.env.rdbHost !== '') {
@@ -15,30 +13,6 @@ if (process.env.rdbPort !== undefined && process.env.rdbPort !== '') {
1513

1614
let doJob = require('./uploader.js')
1715

18-
let mongoDBConnection = config.get('mongoDBConnection')
19-
20-
let mongoURL = mongoDBConnection.URL
21-
if (process.env.mongoURL !== undefined && process.env.mongoURL !== '') {
22-
mongoURL = process.env.mongoURL
23-
}
24-
25-
// console.log("==========", mongoURL)
26-
// `Job` here has essentially the same API as JobCollection on Meteor.
27-
// In fact, job-collection is built on top of the 'meteor-job' npm package!
28-
mongoose.Promise = global.Promise
29-
// Connect to the beerlocker MongoDB
30-
// mongoose.connect('mongodb://localhost:3001/meteor');
31-
mongoose.connect(mongoURL, {reconnectInterval: 5000, poolSize: 5, reconnectTries: 30, keepAlive: 800000, connectTimeoutMS: 800000}, function (err, db) {
32-
if (err) {
33-
console.log('error.........', err)
34-
}
35-
})
36-
// mongoose.connect('mongodb://obdev:123456@ds133311.mlab.com:33311/closeoutpromo');
37-
let ObjSchema = mongoose.Schema
38-
39-
module.exports = mongoose
40-
module.exports = ObjSchema
41-
4216
let queueOption = {
4317
name: 'uploaderJobQue'
4418
}

0 commit comments

Comments
 (0)