@@ -1182,21 +1182,30 @@ var pluginManager = function pluginManager() {
1182
1182
if ( dbName . indexOf ( 'mongodb://' ) !== 0 ) {
1183
1183
dbName = 'mongodb://' + dbName ;
1184
1184
}
1185
+ var db_name = "countly" ;
1186
+ try {
1187
+ db_name = dbName . split ( "/" ) . pop ( ) . split ( "?" ) [ 0 ] ;
1188
+ }
1189
+ catch ( ex ) {
1190
+ db_name = "countly" ;
1191
+ }
1185
1192
1186
1193
try {
1187
- dbOptions . appname = process . title + ": " + dbName . split ( "/" ) . pop ( ) . split ( "?" ) [ 0 ] + "(" + maxPoolSize + ") " + process . pid ;
1194
+ dbOptions . appname = process . title + ": " + db_name + "(" + maxPoolSize + ") " + process . pid ;
1188
1195
}
1189
1196
catch ( ex ) {
1190
1197
//silent
1191
1198
}
1192
1199
1193
1200
mngr . dispatch ( "/db/pre_connect" , {
1201
+ db : db_name ,
1194
1202
connection : dbName ,
1195
1203
options : dbOptions
1196
1204
} ) ;
1197
1205
1198
1206
var countlyDb = mongo . db ( dbName , dbOptions ) ;
1199
1207
countlyDb . _cly_debug = {
1208
+ db : db_name ,
1200
1209
connection : dbName ,
1201
1210
options : dbOptions
1202
1211
} ;
@@ -1235,7 +1244,8 @@ var pluginManager = function pluginManager() {
1235
1244
1236
1245
countlyDb . onOpened ( function ( ) {
1237
1246
mngr . dispatch ( "/db/connected" , {
1238
- db : countlyDb ,
1247
+ db : db_name ,
1248
+ instance : countlyDb ,
1239
1249
connection : dbName ,
1240
1250
options : dbOptions
1241
1251
} ) ;
@@ -1329,6 +1339,7 @@ var pluginManager = function pluginManager() {
1329
1339
ob . _findAndModify = ob . findAndModify ;
1330
1340
ob . findAndModify = function ( query , sort , doc , options , callback ) {
1331
1341
mngr . dispatch ( "/db/readAndUpdate" , {
1342
+ db : db_name ,
1332
1343
operation : "findAndModify" ,
1333
1344
collection : collection ,
1334
1345
query : query ,
@@ -1372,6 +1383,7 @@ var pluginManager = function pluginManager() {
1372
1383
obj [ "_" + name ] = obj [ name ] ;
1373
1384
obj [ name ] = function ( selector , doc , options , callback ) {
1374
1385
mngr . dispatch ( "/db/update" , {
1386
+ db : db_name ,
1375
1387
operation : name ,
1376
1388
collection : collection ,
1377
1389
query : selector ,
@@ -1458,6 +1470,7 @@ var pluginManager = function pluginManager() {
1458
1470
obj [ "_" + name ] = obj [ name ] ;
1459
1471
obj [ name ] = function ( selector , options , callback ) {
1460
1472
mngr . dispatch ( "/db/write" , {
1473
+ db : db_name ,
1461
1474
operation : name ,
1462
1475
collection : collection ,
1463
1476
query : selector ,
@@ -1525,6 +1538,7 @@ var pluginManager = function pluginManager() {
1525
1538
obj [ "_" + name ] = obj [ name ] ;
1526
1539
obj [ name ] = function ( query , options , callback ) {
1527
1540
mngr . dispatch ( "/db/read" , {
1541
+ db : db_name ,
1528
1542
operation : name ,
1529
1543
collection : collection ,
1530
1544
query : query ,
@@ -1579,6 +1593,7 @@ var pluginManager = function pluginManager() {
1579
1593
}
1580
1594
}
1581
1595
mngr . dispatch ( "/db/read" , {
1596
+ db : db_name ,
1582
1597
operation : "find" ,
1583
1598
collection : collection ,
1584
1599
query : query ,
0 commit comments