Skip to content

Commit bee0f6d

Browse files
artem-vartem-v
committed
Improved number pattern in logs
1 parent fef7960 commit bee0f6d

File tree

4 files changed

+64
-36
lines changed

4 files changed

+64
-36
lines changed

‎cluster/src/main/java/io/scalecube/cluster/fdetector/FailureDetectorImpl.java‎

Lines changed: 43 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public FailureDetectorImpl(
9191
ex ->
9292
LOGGER.log(
9393
Level.ERROR,
94-
"[{0}][{1}][onMessage][error] cause:",
94+
"[{0}][{1,number,#}][onMessage][error] cause:",
9595
localMember,
9696
currentPeriod,
9797
ex)),
@@ -102,7 +102,7 @@ public FailureDetectorImpl(
102102
ex ->
103103
LOGGER.log(
104104
Level.ERROR,
105-
"[{0}][{1}][onMembershipEvent][error] cause:",
105+
"[{0}][{1,number,#}][onMembershipEvent][error] cause:",
106106
localMember,
107107
currentPeriod,
108108
ex))));
@@ -148,7 +148,8 @@ private void doPing() {
148148
PingData pingData = new PingData(localMember, pingMember);
149149
Message pingMsg = Message.withData(pingData).qualifier(PING).correlationId(cid).build();
150150

151-
LOGGER.log(Level.DEBUG, "[{0}][{1}] Send Ping to {2}", localMember, period, pingMember);
151+
LOGGER.log(
152+
Level.DEBUG, "[{0}][{1,number,#}] Send Ping to {2}", localMember, period, pingMember);
152153
String address = pingMember.address();
153154
transport
154155
.requestResponse(address, pingMsg)
@@ -158,7 +159,7 @@ private void doPing() {
158159
message -> {
159160
LOGGER.log(
160161
Level.DEBUG,
161-
"[{0}][{1}] Received PingAck from {2}",
162+
"[{0}][{1,number,#}] Received PingAck from {2}",
162163
localMember,
163164
period,
164165
message.sender());
@@ -167,7 +168,7 @@ private void doPing() {
167168
ex -> {
168169
LOGGER.log(
169170
Level.DEBUG,
170-
"[{0}][{1}] Failed to get PingAck from {2} within {3} ms",
171+
"[{0}][{1,number,#}] Failed to get PingAck from {2} within {3} ms",
171172
localMember,
172173
period,
173174
pingMember,
@@ -177,7 +178,8 @@ private void doPing() {
177178
final List<Member> pingReqMembers = selectPingReqMembers(pingMember);
178179

179180
if (timeLeft <= 0 || pingReqMembers.isEmpty()) {
180-
LOGGER.log(Level.DEBUG, "[{0}][{1}] No PingReq occurred", localMember, period);
181+
LOGGER.log(
182+
Level.DEBUG, "[{0}][{1,number,#}] No PingReq occurred", localMember, period);
181183
publishPingResult(period, pingMember, MemberStatus.SUSPECT);
182184
} else {
183185
doPingReq(currentPeriod, pingMember, pingReqMembers, cid);
@@ -194,7 +196,7 @@ private void doPingReq(
194196
.build();
195197
LOGGER.log(
196198
Level.DEBUG,
197-
"[{0}][{1}] Send PingReq to {2} for {3}",
199+
"[{0}][{1,number,#}] Send PingReq to {2} for {3}",
198200
localMember,
199201
period,
200202
pingReqMembers,
@@ -211,7 +213,7 @@ private void doPingReq(
211213
message -> {
212214
LOGGER.log(
213215
Level.DEBUG,
214-
"[{0}][{1}] Received transit PingAck from {2} to {3}",
216+
"[{0}][{1,number,#}] Received transit PingAck from {2} to {3}",
215217
localMember,
216218
period,
217219
message.sender(),
@@ -221,8 +223,9 @@ private void doPingReq(
221223
throwable -> {
222224
LOGGER.log(
223225
Level.DEBUG,
224-
"[{0}][{1}] "
225-
+ "Timeout getting transit PingAck from {2} to {3} within {4} ms",
226+
"[{0}][{1,number,#}] "
227+
+ "Timeout getting transit "
228+
+ "PingAck from {2} to {3} within {4,number,#}ms",
226229
localMember,
227230
period,
228231
member,
@@ -250,13 +253,14 @@ private void onMessage(Message message) {
250253
private void onPing(Message message) {
251254
long period = this.currentPeriod;
252255
String sender = message.sender();
253-
LOGGER.log(Level.DEBUG, "[{0}][{1}] Received Ping from {2}", localMember, period, sender);
256+
LOGGER.log(
257+
Level.DEBUG, "[{0}][{1,number,#}] Received Ping from {2}", localMember, period, sender);
254258
PingData data = message.data();
255259
data = data.withAckType(AckType.DEST_OK);
256260
if (!data.getTo().id().equals(localMember.id())) {
257261
LOGGER.log(
258262
Level.DEBUG,
259-
"[{0}][{1}] Received Ping from {2} to {3}, but local member is {4}",
263+
"[{0}][{1,number,#}] Received Ping from {2} to {3}, but local member is {4}",
260264
localMember,
261265
period,
262266
sender,
@@ -268,15 +272,16 @@ private void onPing(Message message) {
268272
Message ackMessage =
269273
Message.withData(data).qualifier(PING_ACK).correlationId(correlationId).build();
270274
String address = data.getFrom().address();
271-
LOGGER.log(Level.DEBUG, "[{0}][{1}] Send PingAck to {2}", localMember, period, address);
275+
LOGGER.log(
276+
Level.DEBUG, "[{0}][{1,number,#}] Send PingAck to {2}", localMember, period, address);
272277
transport
273278
.send(address, ackMessage)
274279
.subscribe(
275280
null,
276281
ex ->
277282
LOGGER.log(
278283
Level.DEBUG,
279-
"[{0}][{1}] Failed to send PingAck to {2}, cause: {3}",
284+
"[{0}][{1,number,#}] Failed to send PingAck to {2}, cause: {3}",
280285
localMember,
281286
period,
282287
address,
@@ -287,7 +292,11 @@ private void onPing(Message message) {
287292
private void onPingReq(Message message) {
288293
long period = this.currentPeriod;
289294
LOGGER.log(
290-
Level.DEBUG, "[{0}][{1}] Received PingReq from {2}", localMember, period, message.sender());
295+
Level.DEBUG,
296+
"[{0}][{1,number,#}] Received PingReq from {2}",
297+
localMember,
298+
period,
299+
message.sender());
291300
PingData data = message.data();
292301
Member target = data.getTo();
293302
Member originalIssuer = data.getFrom();
@@ -296,15 +305,16 @@ private void onPingReq(Message message) {
296305
Message pingMessage =
297306
Message.withData(pingReqData).qualifier(PING).correlationId(correlationId).build();
298307
String address = target.address();
299-
LOGGER.log(Level.DEBUG, "[{0}][{1}] Send transit Ping to {2}", localMember, period, address);
308+
LOGGER.log(
309+
Level.DEBUG, "[{0}][{1,number,#}] Send transit Ping to {2}", localMember, period, address);
300310
transport
301311
.send(address, pingMessage)
302312
.subscribe(
303313
null,
304314
ex ->
305315
LOGGER.log(
306316
Level.DEBUG,
307-
"[{0}][{1}] Failed to send transit Ping to {2}, cause: {3}",
317+
"[{0}][{1,number,#}] Failed to send transit Ping to {2}, cause: {3}",
308318
localMember,
309319
period,
310320
address,
@@ -319,7 +329,7 @@ private void onTransitPingAck(Message message) {
319329
long period = this.currentPeriod;
320330
LOGGER.log(
321331
Level.DEBUG,
322-
"[{0}][{1}] Received transit PingAck from {2}",
332+
"[{0}][{1,number,#}] Received transit PingAck from {2}",
323333
localMember,
324334
period,
325335
message.sender());
@@ -332,15 +342,19 @@ private void onTransitPingAck(Message message) {
332342
Message.withData(originalAckData).qualifier(PING_ACK).correlationId(correlationId).build();
333343
String address = target.address();
334344
LOGGER.log(
335-
Level.DEBUG, "[{0}][{1}] Resend transit PingAck to {2}", localMember, period, address);
345+
Level.DEBUG,
346+
"[{0}][{1,number,#}] Resend transit PingAck to {2}",
347+
localMember,
348+
period,
349+
address);
336350
transport
337351
.send(address, originalAckMessage)
338352
.subscribe(
339353
null,
340354
ex ->
341355
LOGGER.log(
342356
Level.DEBUG,
343-
"[{0}][{1}] Failed to resend transit PingAck to {2}, cause: {3}",
357+
"[{0}][{1,number,#}] Failed to resend transit PingAck to {2}, cause: {3}",
344358
localMember,
345359
period,
346360
address,
@@ -354,7 +368,7 @@ private void onMembershipEvent(MembershipEvent event) {
354368
if (removed) {
355369
LOGGER.log(
356370
Level.DEBUG,
357-
"[{0}][{1}] Removed {2} from pingMembers list (size={3})",
371+
"[{0}][{1,number,#}] Removed {2} from pingMembers list (size={3})",
358372
localMember,
359373
currentPeriod,
360374
member,
@@ -368,7 +382,7 @@ private void onMembershipEvent(MembershipEvent event) {
368382
pingMembers.add(index, member);
369383
LOGGER.log(
370384
Level.DEBUG,
371-
"[{0}][{1}] Added {2} to pingMembers list (size={3})",
385+
"[{0}][{1,number,#}] Added {2} to pingMembers list (size={3})",
372386
localMember,
373387
currentPeriod,
374388
member,
@@ -407,7 +421,12 @@ private List<Member> selectPingReqMembers(Member pingMember) {
407421

408422
private void publishPingResult(long period, Member member, MemberStatus status) {
409423
LOGGER.log(
410-
Level.DEBUG, "[{0}][{1}] Member {2} detected as {3}", localMember, period, member, status);
424+
Level.DEBUG,
425+
"[{0}][{1,number,#}] Member {2} detected as {3}",
426+
localMember,
427+
period,
428+
member,
429+
status);
411430
sink.emitNext(new FailureDetectorEvent(member, status), busyLooping(Duration.ofSeconds(3)));
412431
}
413432

@@ -430,7 +449,7 @@ private MemberStatus computeMemberStatus(Message message, long period) {
430449
default:
431450
LOGGER.log(
432451
Level.WARNING,
433-
"[{0}][{1}] Unknown PingData.AckType received: {2}",
452+
"[{0}][{1,number,#}] Unknown PingData.AckType received: {2}",
434453
localMember,
435454
period,
436455
ackType);

‎cluster/src/main/java/io/scalecube/cluster/gossip/GossipProtocolImpl.java‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,11 @@ private void doSpreadGossip() {
169169
Set<String> gossipsToRemove = getGossipsToRemove(period);
170170
if (!gossipsToRemove.isEmpty()) {
171171
LOGGER.log(
172-
Level.DEBUG, "[{0}][{1}] Sweep gossips: {2}", localMember, period, gossipsToRemove);
172+
Level.DEBUG,
173+
"[{0}][{1,number,#}] Sweep gossips: {2}",
174+
localMember,
175+
period,
176+
gossipsToRemove);
173177
for (String gossipId : gossipsToRemove) {
174178
gossips.remove(gossipId);
175179
}
@@ -180,7 +184,7 @@ private void doSpreadGossip() {
180184
if (!gossipsThatSpread.isEmpty()) {
181185
LOGGER.log(
182186
Level.DEBUG,
183-
"[{0}][{1}] Most likely disseminated gossips: {2}",
187+
"[{0}][{1,number,#}] Most likely disseminated gossips: {2}",
184188
localMember,
185189
period,
186190
gossipsThatSpread);
@@ -193,7 +197,11 @@ private void doSpreadGossip() {
193197
}
194198
} catch (Exception ex) {
195199
LOGGER.log(
196-
Level.WARNING, "[{0}][{1}][doSpreadGossip] Exception occurred:", localMember, period, ex);
200+
Level.WARNING,
201+
"[{0}][{1,number,#}][doSpreadGossip] Exception occurred:",
202+
localMember,
203+
period,
204+
ex);
197205
}
198206
}
199207

@@ -240,7 +248,7 @@ private void checkGossipSegmentation() {
240248
if (sequenceIdCollector.size() > intervalsThreshold) {
241249
LOGGER.log(
242250
Level.WARNING,
243-
"[{0}][{1}] Too many missed gossip messages from original gossiper: {2}, "
251+
"[{0}][{1,number,#}] Too many missed gossip messages from original gossiper: {2}, "
244252
+ "current node({3}) was SUSPECTED much for a long time or connection problem",
245253
localMember,
246254
currentPeriod,
@@ -260,7 +268,7 @@ private void onMembershipEvent(MembershipEvent event) {
260268
if (removed) {
261269
LOGGER.log(
262270
Level.DEBUG,
263-
"[{0}][{1}] Removed {2} from remoteMembers list (size={3})",
271+
"[{0}][{1,number,#}] Removed {2} from remoteMembers list (size={3,number,#})",
264272
localMember,
265273
currentPeriod,
266274
member,
@@ -271,7 +279,7 @@ private void onMembershipEvent(MembershipEvent event) {
271279
remoteMembers.add(member);
272280
LOGGER.log(
273281
Level.DEBUG,
274-
"[{0}][{1}] Added {2} to remoteMembers list (size={3})",
282+
"[{0}][{1,number,#}] Added {2} to remoteMembers list (size={3,number,#})",
275283
localMember,
276284
currentPeriod,
277285
member,
@@ -316,7 +324,8 @@ private void spreadGossipsTo(long period, Member member) {
316324
ex ->
317325
LOGGER.log(
318326
Level.DEBUG,
319-
"[{0}][{1}] Failed to send GossipReq({2}) to {3}, cause: {4}",
327+
"[{0}][{1,number,#}] "
328+
+ "Failed to send GossipReq({2}) to {3}, cause: {4}",
320329
localMember,
321330
period,
322331
message,

‎cluster/src/main/java/io/scalecube/cluster/membership/MembershipProtocolImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,7 @@ private void scheduleSuspicionTimeoutTask(MembershipRecord r) {
850850
id -> {
851851
LOGGER.log(
852852
Level.DEBUG,
853-
"[{0}] Scheduled SuspicionTimeoutTask for {1}, suspicionTimeout: {2}",
853+
"[{0}] Scheduled SuspicionTimeoutTask for {1}, suspicionTimeout: {2,number,#}ms",
854854
localMember,
855855
id,
856856
suspicionTimeout);

‎cluster/src/main/java/io/scalecube/cluster/metadata/MetadataStoreImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,14 +117,14 @@ public ByteBuffer updateMetadata(Member member, ByteBuffer metadata) {
117117
if (result == null) {
118118
LOGGER.log(
119119
Level.DEBUG,
120-
"[{0}] Added metadata(size={1}) for member {2}",
120+
"[{0}] Added metadata(size={1,number,#}) for member {2}",
121121
localMember,
122122
value.remaining(),
123123
member);
124124
} else {
125125
LOGGER.log(
126126
Level.DEBUG,
127-
"[{0}] Updated metadata(size={1}) for member {2}",
127+
"[{0}] Updated metadata(size={1,number,#}) for member {2}",
128128
localMember,
129129
value.remaining(),
130130
member);
@@ -142,7 +142,7 @@ public ByteBuffer removeMetadata(Member member) {
142142
if (metadata != null) {
143143
LOGGER.log(
144144
Level.DEBUG,
145-
"[{0}] Removed metadata(size={1}) for member {2}",
145+
"[{0}] Removed metadata(size={1,number,#}) for member {2}",
146146
localMember,
147147
metadata.remaining(),
148148
member);
@@ -187,7 +187,7 @@ public Mono<ByteBuffer> fetchMetadata(Member member) {
187187
LOGGER.log(
188188
Level.WARNING,
189189
"[{0}][{1}] Timeout getting GetMetadataResp "
190-
+ "from {2} within {3} ms, cause: {4}",
190+
+ "from {2} within {3,number,#}ms, cause: {4}",
191191
localMember,
192192
cid,
193193
targetAddress,

0 commit comments

Comments
 (0)