Skip to content

Commit d39589a

Browse files
artem-vartem-v
authored
Merge pull request #304 from scalecube/update-logging-format-final
Updayed logging format in convention: [context][func][func_related_p…
2 parents f9478f7 + ec2f9d2 commit d39589a

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎cluster/src/main/java/io/scalecube/cluster/ClusterImpl.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ private void initLifecycle() {
118118
.then(doStart())
119119
.doOnSuccess(avoid -> onStart.onComplete())
120120
.doOnError(onStart::onError)
121-
.subscribe(null, th -> LOGGER.error("[doStart][{}] Exception occurred:", localMember, th));
121+
.subscribe(null, th -> LOGGER.error("[{}][doStart] Exception occurred:", localMember, th));
122122

123123
shutdown
124124
.then(doShutdown())
125125
.doFinally(s -> onShutdown.onComplete())
126126
.subscribe(
127127
null,
128128
th ->
129-
LOGGER.warn("[doShutdown][{}] Exception occurred: {}", localMember, th.toString()));
129+
LOGGER.warn("[{}][doShutdown] Exception occurred: {}", localMember, th.toString()));
130130
}
131131

132132
/**
@@ -288,8 +288,8 @@ private Mono<Cluster> doStart0() {
288288
.then(Mono.fromRunnable(this::startJmxMonitor))
289289
.then();
290290
})
291-
.doOnSubscribe(s -> LOGGER.info("[doStart][{}] Starting, config: {}", localMember, config))
292-
.doOnSuccess(avoid -> LOGGER.info("[doStart][{}] Started", localMember))
291+
.doOnSubscribe(s -> LOGGER.info("[{}][doStart] Starting, config: {}", localMember, config))
292+
.doOnSuccess(avoid -> LOGGER.info("[{}][doStart] Started", localMember))
293293
.thenReturn(this);
294294
}
295295

@@ -490,28 +490,28 @@ public void shutdown() {
490490
private Mono<Void> doShutdown() {
491491
return Mono.defer(
492492
() -> {
493-
LOGGER.info("[doShutdown][{}] Shutting down", localMember);
493+
LOGGER.info("[{}][doShutdown] Shutting down", localMember);
494494
return Flux.concatDelayError(
495495
leaveCluster(),
496496
dispose(),
497497
transport.stop(),
498498
Mono.fromRunnable(this::stopJmxMonitor))
499499
.then()
500500
.doFinally(s -> scheduler.dispose())
501-
.doOnSuccess(avoid -> LOGGER.info("[doShutdown][{}] Shutdown", localMember));
501+
.doOnSuccess(avoid -> LOGGER.info("[{}][doShutdown] Shutdown", localMember));
502502
});
503503
}
504504

505505
private Mono<Void> leaveCluster() {
506506
return membership
507507
.leaveCluster()
508508
.subscribeOn(scheduler)
509-
.doOnSubscribe(s -> LOGGER.info("[leaveCluster][{}] Leaving cluster", localMember))
510-
.doOnSuccess(s -> LOGGER.info("[leaveCluster][{}] Left cluster", localMember))
509+
.doOnSubscribe(s -> LOGGER.info("[{}][leaveCluster] Leaving cluster", localMember))
510+
.doOnSuccess(s -> LOGGER.info("[{}][leaveCluster] Left cluster", localMember))
511511
.doOnError(
512512
ex ->
513513
LOGGER.warn(
514-
"[leaveCluster][{}] Exception occurred: {}", localMember, ex.toString()))
514+
"[{}][leaveCluster] Exception occurred: {}", localMember, ex.toString()))
515515
.then();
516516
}
517517

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private void doSpreadGossip() {
179179
}
180180
}
181181
} catch (Exception ex) {
182-
LOGGER.warn("[doSpreadGossip][{}][{}] Exception occurred:", localMember, period, ex);
182+
LOGGER.warn("[{}][{}][doSpreadGossip] Exception occurred:", localMember, period, ex);
183183
}
184184
}
185185

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -346,14 +346,14 @@ private void doSync() {
346346

347347
Address address = addressOptional.get();
348348
Message message = prepareSyncDataMsg(SYNC, null);
349-
LOGGER.debug("[doSync][{}] Send Sync to {}", localMember, address);
349+
LOGGER.debug("[{}][doSync] Send Sync to {}", localMember, address);
350350
transport
351351
.send(address, message)
352352
.subscribe(
353353
null,
354354
ex ->
355355
LOGGER.debug(
356-
"[doSync][{}] Failed to send Sync to {}, cause: {}",
356+
"[{}][doSync] Failed to send Sync to {}, cause: {}",
357357
localMember,
358358
address,
359359
ex.toString()));
@@ -421,7 +421,7 @@ private void onFailureDetectorEvent(FailureDetectorEvent fdEvent) {
421421
if (r0.status() == fdEvent.status()) { // status not changed
422422
return;
423423
}
424-
LOGGER.debug("[onFailureDetectorEvent][{}] Received status change: {}", localMember, fdEvent);
424+
LOGGER.debug("[{}][onFailureDetectorEvent] Received status change: {}", localMember, fdEvent);
425425
if (fdEvent.status() == ALIVE) {
426426
// TODO: Consider to make more elegant solution
427427
// Alive won't override SUSPECT so issue instead extra sync with member to force it spread
@@ -434,7 +434,7 @@ private void onFailureDetectorEvent(FailureDetectorEvent fdEvent) {
434434
null,
435435
ex ->
436436
LOGGER.debug(
437-
"[onFailureDetectorEvent][{}] Failed to send Sync to {}, cause: {}",
437+
"[{}][onFailureDetectorEvent] Failed to send Sync to {}, cause: {}",
438438
localMember,
439439
address,
440440
ex.toString()));
@@ -535,7 +535,7 @@ private Mono<Void> updateMembership(MembershipRecord r1, MembershipUpdateReason
535535
// Check if new record r1 overrides existing membership record r0
536536
if ((r0 == null || !r0.isLeaving()) && !r1.isOverrides(r0)) {
537537
LOGGER.debug(
538-
"[updateMembership][{}][{}] Skipping update, "
538+
"[{}][updateMembership][{}] Skipping update, "
539539
+ "can't override r0: {} with received r1: {}",
540540
localMember,
541541
reason,
@@ -582,7 +582,7 @@ private Mono<Void> updateMembership(MembershipRecord r1, MembershipUpdateReason
582582
.doOnError(
583583
ex ->
584584
LOGGER.warn(
585-
"[updateMembership][{}][{}] Skipping to add/update member: {}, "
585+
"[{}][updateMembership][{}] Skipping to add/update member: {}, "
586586
+ "due to failed fetchMetadata call (cause: {})",
587587
localMember,
588588
reason,
@@ -637,7 +637,7 @@ private Mono<Void> onSelfMemberDetected(
637637
membershipTable.put(localMember.id(), r2);
638638

639639
LOGGER.debug(
640-
"[updateMembership][{}][{}] Updating incarnation, "
640+
"[{}][updateMembership][{}] Updating incarnation, "
641641
+ "local record r0: {} to received r1: {}, "
642642
+ "spreading with increased incarnation r2: {}",
643643
localMember,
@@ -676,7 +676,7 @@ private Mono<Void> onLeavingDetected(MembershipRecord r0, MembershipRecord r1) {
676676
}
677677

678678
private void publishEvent(MembershipEvent event) {
679-
LOGGER.info("[publishEvent][{}] {}", localMember, event);
679+
LOGGER.info("[{}][publishEvent] {}", localMember, event);
680680
sink.next(event);
681681
}
682682

‎transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/TransportImpl.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private TransportImpl(DisposableServer server, TransportImpl other) {
114114
stop.then(doStop())
115115
.doFinally(s -> onStop.onComplete())
116116
.subscribe(
117-
null, ex -> LOGGER.warn("[doStop][{}] Exception occurred: {}", address, ex.toString()));
117+
null, ex -> LOGGER.warn("[{}][doStop] Exception occurred: {}", address, ex.toString()));
118118
}
119119

120120
private static Address prepareAddress(DisposableServer server) {
@@ -210,13 +210,13 @@ public final Mono<Void> stop() {
210210
private Mono<Void> doStop() {
211211
return Mono.defer(
212212
() -> {
213-
LOGGER.info("[doStop][{}] Stopping", address);
213+
LOGGER.info("[{}][doStop] Stopping", address);
214214
// Complete incoming messages observable
215215
messageSink.complete();
216216
return Flux.concatDelayError(closeServer(), shutdownLoopResources())
217217
.then()
218218
.doFinally(s -> connections.clear())
219-
.doOnSuccess(avoid -> LOGGER.info("[doStop][{}] Stopped", address));
219+
.doOnSuccess(avoid -> LOGGER.info("[{}][doStop] Stopped", address));
220220
});
221221
}
222222

@@ -270,7 +270,7 @@ private Message toMessage(ByteBuf byteBuf) {
270270
try (ByteBufInputStream stream = new ByteBufInputStream(byteBuf, true)) {
271271
return messageCodec.deserialize(stream);
272272
} catch (Exception e) {
273-
LOGGER.warn("[toMessage][{}] Exception occurred: {}", address, e.toString());
273+
LOGGER.warn("[{}][toMessage] Exception occurred: {}", address, e.toString());
274274
throw new DecoderException(e);
275275
}
276276
}
@@ -282,7 +282,7 @@ private ByteBuf toByteBuf(Message message) {
282282
messageCodec.serialize(message, stream);
283283
} catch (Exception e) {
284284
bb.release();
285-
LOGGER.warn("[toByteBuf][{}] Exception occurred: {}", address, e.toString());
285+
LOGGER.warn("[{}][toByteBuf] Exception occurred: {}", address, e.toString());
286286
throw new EncoderException(e);
287287
}
288288
return bb;
@@ -292,16 +292,16 @@ private Mono<? extends Connection> connect0(Address address1) {
292292
return newTcpClient(address1)
293293
.doOnDisconnected(
294294
c -> {
295-
LOGGER.debug("[disconnected][{}][{}] Channel: {}", address, address1, c.channel());
295+
LOGGER.debug("[{}][disconnected][{}] Channel: {}", address, address1, c.channel());
296296
connections.remove(address1);
297297
})
298298
.doOnConnected(
299-
c -> LOGGER.debug("[connected][{}][{}] Channel: {}", address, address1, c.channel()))
299+
c -> LOGGER.debug("[{}][connected][{}] Channel: {}", address, address1, c.channel()))
300300
.connect()
301301
.doOnError(
302302
th -> {
303303
LOGGER.debug(
304-
"[connect0][{}][{}] Exception occurred: {}", address, address1, th.toString());
304+
"[{}][connect0][{}] Exception occurred: {}", address, address1, th.toString());
305305
connections.remove(address1);
306306
})
307307
.cache();
@@ -313,14 +313,14 @@ private Mono<Void> closeServer() {
313313
if (server == null) {
314314
return Mono.empty();
315315
}
316-
LOGGER.info("[closeServer][{}] Closing server channel", address);
316+
LOGGER.info("[{}][closeServer] Closing server channel", address);
317317
return Mono.fromRunnable(server::dispose)
318318
.then(server.onDispose())
319-
.doOnSuccess(avoid -> LOGGER.info("[closeServer][{}] Closed server channel", address))
319+
.doOnSuccess(avoid -> LOGGER.info("[{}][closeServer] Closed server channel", address))
320320
.doOnError(
321321
e ->
322322
LOGGER.warn(
323-
"[closeServer][{}] Exception occurred: {}", address, e.toString()));
323+
"[{}][closeServer] Exception occurred: {}", address, e.toString()));
324324
});
325325
}
326326

0 commit comments

Comments
 (0)