Skip to content

Commit af01880

Browse files
authored
Merge pull request #301 from scalecube/update/logging
Cosmetic update of logging
2 parents cfe1294 + 7935a10 commit af01880

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -488,25 +488,24 @@ public void shutdown() {
488488
private Mono<Void> doShutdown() {
489489
return Mono.defer(
490490
() -> {
491-
LOGGER.info("[{}] Cluster member is shutting down", localMember);
491+
LOGGER.info("[{}][doShutdown] Shutting down", localMember);
492492
return Flux.concatDelayError(
493493
leaveCluster(),
494494
dispose(),
495495
transport.stop(),
496496
Mono.fromRunnable(this::stopJmxMonitor))
497497
.then()
498498
.doFinally(s -> scheduler.dispose())
499-
.doOnSuccess(
500-
avoid -> LOGGER.info("[{}] Cluster member has been shutdown", localMember));
499+
.doOnSuccess(avoid -> LOGGER.info("[{}][doShutdown] Shutdown", localMember));
501500
});
502501
}
503502

504503
private Mono<Void> leaveCluster() {
505504
return membership
506505
.leaveCluster()
507506
.subscribeOn(scheduler)
508-
.doOnSubscribe(s -> LOGGER.info("[{}] Cluster member is leaving a cluster", localMember))
509-
.doOnSuccess(s -> LOGGER.info("[{}] Cluster member has left a cluster", localMember))
507+
.doOnSubscribe(s -> LOGGER.info("[{}] Leaving a cluster", localMember))
508+
.doOnSuccess(s -> LOGGER.info("[{}] Left a cluster", localMember))
510509
.doOnError(
511510
ex ->
512511
LOGGER.warn(

transport-parent/transport-netty/src/main/java/io/scalecube/transport/netty/ExceptionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ final class ExceptionHandler extends ChannelDuplexHandler {
1818

1919
@Override
2020
public final void exceptionCaught(ChannelHandlerContext ctx, Throwable ex) {
21-
LOGGER.debug("Exception caught for channel {}, cause: {}", ctx.channel(), ex.toString());
21+
LOGGER.debug("Exception caught on channel {}, cause: {}", ctx.channel(), ex.toString());
2222
}
2323
}

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,15 +181,16 @@ public Mono<Transport> bind0() {
181181
return newTcpServer()
182182
.handle(this::onMessage)
183183
.bind()
184+
.map(server -> new TransportImpl(server, this))
185+
.cast(Transport.class)
186+
.doOnSubscribe(s -> LOGGER.info("Bind cluster transport on port={}", config.port()))
187+
.doOnSuccess(t -> LOGGER.info("[{}] Bound cluster transport", t.address()))
184188
.doOnError(
185189
ex ->
186190
LOGGER.error(
187191
"Failed to bind cluster transport on port={}, cause: {}",
188192
config.port(),
189-
ex.toString()))
190-
.map(server -> new TransportImpl(server, this))
191-
.doOnSuccess(t -> LOGGER.info("[{}] Bound cluster transport", t.address()))
192-
.cast(Transport.class);
193+
ex.toString()));
193194
}
194195

195196
@Override
@@ -214,13 +215,13 @@ public final Mono<Void> stop() {
214215
private Mono<Void> doStop() {
215216
return Mono.defer(
216217
() -> {
217-
LOGGER.info("[{}] Transport is shutting down", address);
218+
LOGGER.info("[{}][doStop] Stopping", address);
218219
// Complete incoming messages observable
219220
messageSink.complete();
220221
return Flux.concatDelayError(closeServer(), shutdownLoopResources())
221222
.then()
222223
.doFinally(s -> connections.clear())
223-
.doOnSuccess(avoid -> LOGGER.info("[{}] Transport has been shut down", address));
224+
.doOnSuccess(avoid -> LOGGER.info("[{}][doStop] Stopped", address));
224225
});
225226
}
226227

0 commit comments

Comments
 (0)