Skip to content

Commit 1cf35f4

Browse files
committed
[db] add db name to hooks
1 parent e9a3384 commit 1cf35f4

File tree

1 file changed

+17
-2
lines changed

1 file changed

+17
-2
lines changed

plugins/pluginManager.js

+17-2
Original file line numberDiff line numberDiff line change
@@ -1182,21 +1182,30 @@ var pluginManager = function pluginManager() {
11821182
if (dbName.indexOf('mongodb://') !== 0) {
11831183
dbName = 'mongodb://' + dbName;
11841184
}
1185+
var db_name = "countly";
1186+
try {
1187+
db_name = dbName.split("/").pop().split("?")[0];
1188+
}
1189+
catch (ex) {
1190+
db_name = "countly";
1191+
}
11851192

11861193
try {
1187-
dbOptions.appname = process.title + ": " + dbName.split("/").pop().split("?")[0] + "(" + maxPoolSize + ") " + process.pid;
1194+
dbOptions.appname = process.title + ": " + db_name + "(" + maxPoolSize + ") " + process.pid;
11881195
}
11891196
catch (ex) {
11901197
//silent
11911198
}
11921199

11931200
mngr.dispatch("/db/pre_connect", {
1201+
db: db_name,
11941202
connection: dbName,
11951203
options: dbOptions
11961204
});
11971205

11981206
var countlyDb = mongo.db(dbName, dbOptions);
11991207
countlyDb._cly_debug = {
1208+
db: db_name,
12001209
connection: dbName,
12011210
options: dbOptions
12021211
};
@@ -1235,7 +1244,8 @@ var pluginManager = function pluginManager() {
12351244

12361245
countlyDb.onOpened(function() {
12371246
mngr.dispatch("/db/connected", {
1238-
db: countlyDb,
1247+
db: db_name,
1248+
instance: countlyDb,
12391249
connection: dbName,
12401250
options: dbOptions
12411251
});
@@ -1329,6 +1339,7 @@ var pluginManager = function pluginManager() {
13291339
ob._findAndModify = ob.findAndModify;
13301340
ob.findAndModify = function(query, sort, doc, options, callback) {
13311341
mngr.dispatch("/db/readAndUpdate", {
1342+
db: db_name,
13321343
operation: "findAndModify",
13331344
collection: collection,
13341345
query: query,
@@ -1372,6 +1383,7 @@ var pluginManager = function pluginManager() {
13721383
obj["_" + name] = obj[name];
13731384
obj[name] = function(selector, doc, options, callback) {
13741385
mngr.dispatch("/db/update", {
1386+
db: db_name,
13751387
operation: name,
13761388
collection: collection,
13771389
query: selector,
@@ -1458,6 +1470,7 @@ var pluginManager = function pluginManager() {
14581470
obj["_" + name] = obj[name];
14591471
obj[name] = function(selector, options, callback) {
14601472
mngr.dispatch("/db/write", {
1473+
db: db_name,
14611474
operation: name,
14621475
collection: collection,
14631476
query: selector,
@@ -1525,6 +1538,7 @@ var pluginManager = function pluginManager() {
15251538
obj["_" + name] = obj[name];
15261539
obj[name] = function(query, options, callback) {
15271540
mngr.dispatch("/db/read", {
1541+
db: db_name,
15281542
operation: name,
15291543
collection: collection,
15301544
query: query,
@@ -1579,6 +1593,7 @@ var pluginManager = function pluginManager() {
15791593
}
15801594
}
15811595
mngr.dispatch("/db/read", {
1596+
db: db_name,
15821597
operation: "find",
15831598
collection: collection,
15841599
query: query,

0 commit comments

Comments
 (0)