@@ -55,6 +55,10 @@ var serverAccounting = false;
55
55
var servers = { } ;
56
56
var BSON = retrieveBSON ( ) ;
57
57
58
+ function topologyId ( server ) {
59
+ return server . s . parent == null ? server . id : server . s . parent . id ;
60
+ }
61
+
58
62
/**
59
63
* Creates a new Server instance
60
64
* @class
@@ -151,8 +155,6 @@ var Server = function(options) {
151
155
// Monitoring timeout
152
156
monitoringInterval :
153
157
typeof options . monitoringInterval === 'number' ? options . monitoringInterval : 5000 ,
154
- // Topology id
155
- topologyId : - 1 ,
156
158
compression : { compressors : createCompressionInfo ( options ) } ,
157
159
// Optional parent topology
158
160
parent : options . parent
@@ -486,14 +488,11 @@ Server.prototype.connect = function(options) {
486
488
487
489
// Emit toplogy opening event if not in topology
488
490
if ( ! self . s . inTopology ) {
489
- this . emit ( 'topologyOpening' , { topologyId : self . id } ) ;
491
+ this . emit ( 'topologyOpening' , { topologyId : topologyId ( self ) } ) ;
490
492
}
491
493
492
494
// Emit opening server event
493
- self . emit ( 'serverOpening' , {
494
- topologyId : self . s . topologyId !== - 1 ? self . s . topologyId : self . id ,
495
- address : self . name
496
- } ) ;
495
+ self . emit ( 'serverOpening' , { topologyId : topologyId ( self ) , address : self . name } ) ;
497
496
498
497
self . s . pool . connect ( ) ;
499
498
} ;
@@ -883,14 +882,11 @@ Server.prototype.destroy = function(options, callback) {
883
882
884
883
// Emit opening server event
885
884
if ( self . listeners ( 'serverClosed' ) . length > 0 )
886
- self . emit ( 'serverClosed' , {
887
- topologyId : self . s . topologyId !== - 1 ? self . s . topologyId : self . id ,
888
- address : self . name
889
- } ) ;
885
+ self . emit ( 'serverClosed' , { topologyId : topologyId ( self ) , address : self . name } ) ;
890
886
891
887
// Emit toplogy opening event if not in topology
892
888
if ( self . listeners ( 'topologyClosed' ) . length > 0 && ! self . s . inTopology ) {
893
- self . emit ( 'topologyClosed' , { topologyId : self . id } ) ;
889
+ self . emit ( 'topologyClosed' , { topologyId : topologyId ( self ) } ) ;
894
890
}
895
891
896
892
if ( self . s . logger . isDebug ( ) ) {
0 commit comments