Skip to content

Commit cfb058d

Browse files
artem-vartem-v
authored
Merge pull request #297 from scalecube/update/logging
Updated logging
2 parents a7fba99 + 3f91dfd commit cfb058d

File tree

14 files changed

+71
-93
lines changed

14 files changed

+71
-93
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -479,21 +479,21 @@ public void shutdown() {
479479
private Mono<Void> doShutdown() {
480480
return Mono.defer(
481481
() -> {
482-
LOGGER.debug("[{}] Cluster member is shutting down", localMember);
482+
LOGGER.info("[{}] Cluster member is shutting down", localMember);
483483
return Flux.concatDelayError(leaveCluster(), dispose(), transport.stop())
484484
.then()
485485
.doFinally(s -> scheduler.dispose())
486486
.doOnSuccess(
487-
avoid -> LOGGER.debug("[{}] Cluster member has been shutdown", localMember));
487+
avoid -> LOGGER.info("[{}] Cluster member has been shutdown", localMember));
488488
});
489489
}
490490

491491
private Mono<Void> leaveCluster() {
492492
return membership
493493
.leaveCluster()
494494
.subscribeOn(scheduler)
495-
.doOnSubscribe(s -> LOGGER.debug("[{}] Cluster member is leaving a cluster", localMember))
496-
.doOnSuccess(s -> LOGGER.debug("[{}] Cluster member has left a cluster", localMember))
495+
.doOnSubscribe(s -> LOGGER.info("[{}] Cluster member is leaving a cluster", localMember))
496+
.doOnSuccess(s -> LOGGER.info("[{}] Cluster member has left a cluster", localMember))
497497
.doOnError(
498498
ex ->
499499
LOGGER.warn(

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ private void doPing() {
151151
publishPingResult(period, pingMember, computeMemberStatus(message, period));
152152
},
153153
ex -> {
154-
LOGGER.debug(
154+
LOGGER.warn(
155155
"[{}][{}] Failed to get PingAck from {} within {} ms",
156156
localMember,
157157
period,
@@ -198,7 +198,7 @@ private void doPingReq(
198198
publishPingResult(period, pingMember, computeMemberStatus(message, period));
199199
},
200200
throwable -> {
201-
LOGGER.debug(
201+
LOGGER.warn(
202202
"[{}][{}] Timeout getting transit PingAck from {} to {} within {} ms",
203203
localMember,
204204
period,
@@ -250,7 +250,7 @@ private void onPing(Message message) {
250250
.subscribe(
251251
null,
252252
ex ->
253-
LOGGER.debug(
253+
LOGGER.warn(
254254
"[{}][{}] Failed to send PingAck to {}, cause: {}",
255255
localMember,
256256
period,
@@ -276,7 +276,7 @@ private void onPingReq(Message message) {
276276
.subscribe(
277277
null,
278278
ex ->
279-
LOGGER.debug(
279+
LOGGER.warn(
280280
"[{}][{}] Failed to send transit Ping to {}, cause: {}",
281281
localMember,
282282
period,
@@ -306,7 +306,7 @@ private void onTransitPingAck(Message message) {
306306
.subscribe(
307307
null,
308308
ex ->
309-
LOGGER.debug(
309+
LOGGER.warn(
310310
"[{}][{}] Failed to resend transit PingAck to {}, cause: {}",
311311
localMember,
312312
period,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ private void spreadGossipsTo(long period, Member member) {
299299
.subscribe(
300300
null,
301301
ex ->
302-
LOGGER.debug(
302+
LOGGER.warn(
303303
"[{}][{}] Failed to send GossipReq({}) to {}, cause: {}",
304304
localMember,
305305
period,

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

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ private void start0(MonoSink<Object> sink) {
261261
return;
262262
}
263263
// If seed addresses are specified in config - send initial sync to those nodes
264-
LOGGER.debug("[{}] Making initial Sync to all seed members: {}", localMember, seedMembers);
264+
LOGGER.info("[{}] Making initial Sync to all seed members: {}", localMember, seedMembers);
265265

266266
//noinspection unchecked
267267
Mono<Message>[] syncs =
@@ -289,7 +289,7 @@ private void start0(MonoSink<Object> sink) {
289289
.subscribe(
290290
null,
291291
ex ->
292-
LOGGER.debug(
292+
LOGGER.warn(
293293
"[{}] Exception on initial SyncAck, cause: {}", localMember, ex.toString()));
294294
}
295295

@@ -352,7 +352,7 @@ private void doSync() {
352352
.subscribe(
353353
null,
354354
ex ->
355-
LOGGER.debug(
355+
LOGGER.warn(
356356
"[{}][doSync] Failed to send Sync to {}, cause: {}",
357357
localMember,
358358
address,
@@ -403,7 +403,7 @@ private Mono<Void> onSync(Message syncMsg) {
403403
.subscribe(
404404
null,
405405
ex ->
406-
LOGGER.debug(
406+
LOGGER.warn(
407407
"[{}] Failed to send SyncAck to {}, cause: {}",
408408
localMember,
409409
sender,
@@ -433,7 +433,7 @@ private void onFailureDetectorEvent(FailureDetectorEvent fdEvent) {
433433
.subscribe(
434434
null,
435435
ex ->
436-
LOGGER.debug(
436+
LOGGER.warn(
437437
"[{}][onFailureDetectorEvent] Failed to send Sync to {}, cause: {}",
438438
localMember,
439439
address,
@@ -581,7 +581,7 @@ private Mono<Void> updateMembership(MembershipRecord r1, MembershipUpdateReason
581581
.fetchMetadata(r1.member())
582582
.doOnError(
583583
ex ->
584-
LOGGER.debug(
584+
LOGGER.warn(
585585
"[{}][updateMembership][{}] Skipping to add/update member: {}, "
586586
+ "due to failed fetchMetadata call (cause: {})",
587587
localMember,
@@ -676,7 +676,7 @@ private Mono<Void> onLeavingDetected(MembershipRecord r0, MembershipRecord r1) {
676676
}
677677

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

@@ -699,9 +699,9 @@ private Mono<Void> onDeadMemberDetected(MembershipRecord r1) {
699699

700700
// Log that member leaved gracefully or without notification
701701
if (r0.isLeaving()) {
702-
LOGGER.debug("[{}] Member leaved gracefully: {}", localMember, member);
702+
LOGGER.info("[{}] Member leaved gracefully: {}", localMember, member);
703703
} else {
704-
LOGGER.warn("[{}] Member leaved without notification: {}", localMember, member);
704+
LOGGER.info("[{}] Member leaved without notification: {}", localMember, member);
705705
}
706706

707707
final long timestamp = System.currentTimeMillis();
@@ -756,7 +756,7 @@ private void scheduleSuspicionTimeoutTask(MembershipRecord r) {
756756
r.member().id(),
757757
id -> {
758758
LOGGER.debug(
759-
"[{}] Scheduled SuspicionTimeoutTask for {}, suspicionTimeout {}",
759+
"[{}] Scheduled SuspicionTimeoutTask for {}, suspicionTimeout: {}",
760760
localMember,
761761
id,
762762
suspicionTimeout);
@@ -794,7 +794,7 @@ private Mono<Void> spreadMembershipGossip(MembershipRecord r) {
794794
.spread(msg)
795795
.doOnError(
796796
ex ->
797-
LOGGER.debug(
797+
LOGGER.warn(
798798
"[{}] Failed to send membership with gossip, cause: {}",
799799
localMember,
800800
ex.toString()))
@@ -864,10 +864,7 @@ private List<Member> getSuspectedMembers() {
864864
}
865865

866866
private List<Member> getRemovedMembers() {
867-
return removedMembersHistory //
868-
.stream()
869-
.map(MembershipEvent::member)
870-
.collect(Collectors.toList());
867+
return removedMembersHistory.stream().map(MembershipEvent::member).collect(Collectors.toList());
871868
}
872869

873870
private List<Member> findRecordsByCondition(Predicate<MembershipRecord> condition) {

‎cluster/src/test/java/io/scalecube/cluster/ClusterTest.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,7 @@ public void testJoinDynamicPort() {
171171
} finally {
172172
// Shutdown all nodes
173173
shutdown(
174-
Stream.concat(
175-
Stream.of(seedNode), //
176-
otherNodes.stream())
177-
.collect(Collectors.toList()));
174+
Stream.concat(Stream.of(seedNode), otherNodes.stream()).collect(Collectors.toList()));
178175
}
179176
}
180177

@@ -243,9 +240,7 @@ public void onMembershipEvent(MembershipEvent event) {
243240
} finally {
244241
// Shutdown all nodes
245242
shutdown(
246-
Stream.concat(
247-
Stream.of(seedNode, metadataNode), //
248-
otherNodes.stream())
243+
Stream.concat(Stream.of(seedNode, metadataNode), otherNodes.stream())
249244
.collect(Collectors.toList()));
250245
}
251246
}
@@ -321,9 +316,7 @@ public void onMembershipEvent(MembershipEvent event) {
321316
} finally {
322317
// Shutdown all nodes
323318
shutdown(
324-
Stream.concat(
325-
Stream.of(seedNode, metadataNode), //
326-
otherNodes.stream())
319+
Stream.concat(Stream.of(seedNode, metadataNode), otherNodes.stream())
327320
.collect(Collectors.toList()));
328321
}
329322
}
@@ -400,9 +393,7 @@ public void onMembershipEvent(MembershipEvent event) {
400393
} finally {
401394
// Shutdown all nodes
402395
shutdown(
403-
Stream.concat(
404-
Stream.of(seedNode, metadataNode), //
405-
otherNodes.stream())
396+
Stream.concat(Stream.of(seedNode, metadataNode), otherNodes.stream())
406397
.collect(Collectors.toList()));
407398
}
408399
}

‎cluster/src/test/java/io/scalecube/cluster/fdetector/FailureDetectorTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.junit.jupiter.api.AfterEach;
2727
import org.junit.jupiter.api.BeforeEach;
2828
import org.junit.jupiter.api.Test;
29-
import org.junit.jupiter.api.TestInfo;
3029
import reactor.core.publisher.Flux;
3130
import reactor.core.scheduler.Scheduler;
3231
import reactor.core.scheduler.Schedulers;
@@ -36,8 +35,8 @@ public class FailureDetectorTest extends BaseTest {
3635
private Scheduler scheduler;
3736

3837
@BeforeEach
39-
void setUp(TestInfo testInfo) {
40-
scheduler = Schedulers.newSingle(testInfo.getDisplayName().replaceAll(" ", "_"), true);
38+
void setUp() {
39+
scheduler = Schedulers.newSingle("scheduler", true);
4140
}
4241

4342
@AfterEach

‎cluster/src/test/java/io/scalecube/cluster/gossip/GossipProtocolTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.util.stream.Stream;
3131
import org.junit.jupiter.api.AfterEach;
3232
import org.junit.jupiter.api.BeforeEach;
33-
import org.junit.jupiter.api.TestInfo;
3433
import org.junit.jupiter.params.ParameterizedTest;
3534
import org.junit.jupiter.params.provider.Arguments;
3635
import org.junit.jupiter.params.provider.MethodSource;
@@ -92,8 +91,8 @@ static Stream<Arguments> experiment() {
9291
private Scheduler scheduler;
9392

9493
@BeforeEach
95-
void setUp(TestInfo testInfo) {
96-
scheduler = Schedulers.newSingle(testInfo.getDisplayName().replaceAll(" ", "_"), true);
94+
void setUp() {
95+
scheduler = Schedulers.newSingle("scheduler", true);
9796
}
9897

9998
@AfterEach

‎cluster/src/test/java/io/scalecube/cluster/membership/MembershipProtocolTest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.junit.jupiter.api.AfterEach;
3131
import org.junit.jupiter.api.BeforeEach;
3232
import org.junit.jupiter.api.Test;
33-
import org.junit.jupiter.api.TestInfo;
3433
import reactor.core.Exceptions;
3534
import reactor.core.publisher.DirectProcessor;
3635
import reactor.core.publisher.Flux;
@@ -51,8 +50,8 @@ public class MembershipProtocolTest extends BaseTest {
5150
private Scheduler scheduler;
5251

5352
@BeforeEach
54-
void setUp(TestInfo testInfo) {
55-
scheduler = Schedulers.newSingle(testInfo.getDisplayName().replaceAll(" ", "_"), true);
53+
void setUp() {
54+
scheduler = Schedulers.newSingle("scheduler", true);
5655
stopables = new ArrayList<>();
5756
}
5857

‎cluster/src/test/resources/log4j2-test.xml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,21 @@
44
<Appenders>
55
<Console name="console" target="SYSTEM_OUT">
66
<PatternLayout>
7-
<pattern>%level{length=1} %date{MMdd-HHmm:ss,SSS} %logger{1.} %message [%thread]%n</pattern>
7+
<pattern>%level{length=1} %date{HHmm:ss,SSS} %logger{1.} %message [%thread]%n</pattern>
88
</PatternLayout>
99
</Console>
1010
</Appenders>
1111

1212
<Loggers>
13-
<Logger name="io.netty" level="info"/>
14-
<Logger name="reactor.netty" level="info"/>
15-
<Logger name="io.scalecube.cluster.transport" level="info"/>
16-
<Logger name="io.scalecube.cluster.fdetector" level="info"/>
17-
<Logger name="io.scalecube.cluster.gossip" level="info"/>
18-
<Logger name="io.scalecube.cluster.membership" level="info"/>
19-
<Logger name="io.scalecube.cluster.metadata" level="info"/>
20-
<Logger name="io.scalecube.cluster" level="info"/>
21-
<Logger name="io.scalecube.services" level="info"/>
13+
<Logger name="io.netty" level="${env:nettyLogLevel:-error}"/>
14+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-error}"/>
15+
<Logger name="io.scalecube.cluster.transport" level="${env:clusterTransport:-error}"/>
16+
<Logger name="io.scalecube.cluster.fdetector" level="${env:clusterFdetector:-error}"/>
17+
<Logger name="io.scalecube.cluster.gossip" level="${env:clusterGossip:-error}"/>
18+
<Logger name="io.scalecube.cluster.membership" level="${env:clusterMembership:-error}"/>
19+
<Logger name="io.scalecube.cluster.metadata" level="${env:clusterMetadata:-error}"/>
2220

23-
<Root level="info">
21+
<Root level="${env:logLevel:-error}">
2422
<AppenderRef ref="console"/>
2523
</Root>
2624
</Loggers>

‎transport-parent/transport-api/src/main/java/io/scalecube/cluster/transport/api/Message.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,8 @@ public Address sender() {
197197
@Override
198198
public String toString() {
199199
return new StringJoiner(", ", Message.class.getSimpleName() + "[", "]")
200-
.add("headers=" + headers)
201-
.add("data=" + data)
200+
.add("headers(" + headers.size() + ")")
201+
.add("data=" + (data != null ? data.getClass().getName() : null))
202202
.toString();
203203
}
204204

0 commit comments

Comments
 (0)