Skip to content

Commit 263143f

Browse files
committed
tech review comments
1 parent 7ca895b commit 263143f

File tree

2 files changed

+86
-90
lines changed

2 files changed

+86
-90
lines changed

source/includes/monitoring/monitoring.rb

Lines changed: 86 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -11,77 +11,77 @@
1111

1212
# start-sdam
1313
class SDAMLogSubscriber
14-
include Mongo::Loggable
15-
16-
def succeeded(event)
17-
log_debug(format_event(event))
18-
end
19-
20-
private
21-
22-
def logger
23-
Mongo::Logger.logger
24-
end
25-
26-
def format_message(message)
27-
format("SDAM | %s".freeze, message)
28-
end
14+
include Mongo::Loggable
15+
16+
def succeeded(event)
17+
log_debug(format_event(event))
2918
end
30-
31-
class TopologyOpeningLogSubscriber < SDAMLogSubscriber
32-
private
33-
34-
def format_event(event)
35-
"Topology type '#{event.topology.display_name}' initializing."
36-
end
19+
20+
private
21+
22+
def logger
23+
Mongo::Logger.logger
3724
end
38-
39-
class ServerOpeningLogSubscriber < SDAMLogSubscriber
40-
private
41-
42-
def format_event(event)
43-
"Server #{event.address} initializing."
44-
end
25+
26+
def format_message(message)
27+
format("SDAM | %s", message)
4528
end
29+
end
4630

47-
class ServerDescriptionChangedLogSubscriber < SDAMLogSubscriber
48-
private
49-
50-
def format_event(event)
51-
"Server description for #{event.address} changed from " +
52-
"'#{event.previous_description.server_type}' to '#{event.new_description.server_type}'."
53-
end
31+
class TopologyOpeningLogSubscriber < SDAMLogSubscriber
32+
private
33+
34+
def format_event(event)
35+
"Topology type '#{event.topology.display_name}' initializing."
5436
end
55-
56-
class TopologyChangedLogSubscriber < SDAMLogSubscriber
57-
private
58-
59-
def format_event(event)
60-
if event.previous_topology != event.new_topology
61-
"Topology type '#{event.previous_topology.display_name}' changed to " +
62-
"type '#{event.new_topology.display_name}'."
63-
else
64-
"There was a change in the members of the '#{event.new_topology.display_name}' " +
65-
"topology."
66-
end
67-
end
37+
end
38+
39+
class ServerOpeningLogSubscriber < SDAMLogSubscriber
40+
private
41+
42+
def format_event(event)
43+
"Server #{event.address} initializing."
6844
end
69-
70-
class ServerClosedLogSubscriber < SDAMLogSubscriber
71-
private
72-
73-
def format_event(event)
74-
"Server #{event.address} connection closed."
75-
end
45+
end
46+
47+
class ServerDescriptionChangedLogSubscriber < SDAMLogSubscriber
48+
private
49+
50+
def format_event(event)
51+
"Server description for #{event.address} changed from " +
52+
"'#{event.previous_description.server_type}' to '#{event.new_description.server_type}'."
7653
end
77-
78-
class TopologyClosedLogSubscriber < SDAMLogSubscriber
79-
private
80-
81-
def format_event(event)
82-
"Topology type '#{event.topology.display_name}' closed."
54+
end
55+
56+
class TopologyChangedLogSubscriber < SDAMLogSubscriber
57+
private
58+
59+
def format_event(event)
60+
if event.previous_topology != event.new_topology
61+
"Topology type '#{event.previous_topology.display_name}' changed to " +
62+
"type '#{event.new_topology.display_name}'."
63+
else
64+
"There was a change in the members of the '#{event.new_topology.display_name}' " +
65+
"topology."
8366
end
8467
end
68+
end
69+
70+
class ServerClosedLogSubscriber < SDAMLogSubscriber
71+
private
72+
73+
def format_event(event)
74+
"Server #{event.address} connection closed."
75+
end
76+
end
77+
78+
class TopologyClosedLogSubscriber < SDAMLogSubscriber
79+
private
80+
81+
def format_event(event)
82+
"Topology type '#{event.topology.display_name}' closed."
83+
end
84+
end
8585
#end-sdam
8686

8787
# start-sdam-subscriber-global
@@ -135,30 +135,30 @@ def format_event(event)
135135

136136
# start-heartbeat
137137
class HeartbeatLogSubscriber
138-
include Mongo::Loggable
139-
140-
def started(event)
141-
log_debug("#{event.address} | STARTED")
142-
end
143-
144-
def succeeded(event)
145-
log_debug("#{event.address} | SUCCEEDED | #{event.duration}s")
146-
end
147-
148-
def failed(event)
149-
log_debug("#{event.address} | FAILED | #{event.error.class}: #{event.error.message} | #{event.duration}s")
150-
end
151-
152-
private
153-
154-
def logger
155-
Mongo::Logger.logger
156-
end
157-
158-
def format_message(message)
159-
format("HEARTBEAT | %s".freeze, message)
160-
end
138+
include Mongo::Loggable
139+
140+
def started(event)
141+
log_debug("#{event.address} | STARTED")
142+
end
143+
144+
def succeeded(event)
145+
log_debug("#{event.address} | SUCCEEDED | #{event.duration}s")
161146
end
147+
148+
def failed(event)
149+
log_debug("#{event.address} | FAILED | #{event.error.class}: #{event.error.message} | #{event.duration}s")
150+
end
151+
152+
private
153+
154+
def logger
155+
Mongo::Logger.logger
156+
end
157+
158+
def format_message(message)
159+
format("HEARTBEAT | %s", message)
160+
end
161+
end
162162
# end-heartbeat
163163

164164
# start-heartbeat-subscribe
@@ -168,6 +168,6 @@ def format_message(message)
168168
Mongo::Monitoring::Global.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
169169

170170
# Subscribes to Server Opening events at the client level
171-
client = Mongo::Client.new([ '127.0.0.1:27017' ], :database => 'test' )
171+
client = Mongo::Client.new([ '127.0.0.1:27017' ], database: 'test' )
172172
client.subscribe( Mongo::Monitoring::SERVER_HEARTBEAT, subscriber )
173173
# end-heartbeat-subscribe

source/monitoring/cluster-monitoring.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,6 @@ The following table provides available subscribers and their monitoring topic:
5757
- Monitoring Topic
5858
- Description
5959

60-
* - `SDAMLogSubscriber <{+api-root+}/Mongo/Monitoring/SDAMLogSubscriber.html>`__
61-
-
62-
- Subscribes to SDAM events and logs them.
63-
6460
* - `ServerClosedLogSubscriber <{+api-root+}/Mongo/Monitoring/ServerClosedLogSubscriber.html>`__
6561
- ``SERVER_CLOSED``
6662
- Subscribes to ``ServerClosed`` events and logs them.

0 commit comments

Comments
 (0)