Skip to content

Commit 482c0c4

Browse files
rstoyanchevrstoyanchev
authored
Fix logging in examples and load-balancer tests (rsocket#800)
1 parent 97bf015 commit 482c0c4

13 files changed

Lines changed: 141 additions & 89 deletions

File tree

‎rsocket-examples/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ dependencies {
2222
implementation project(':rsocket-core')
2323
implementation project(':rsocket-transport-local')
2424
implementation project(':rsocket-transport-netty')
25+
runtimeOnly 'ch.qos.logback:logback-classic'
2526

2627
testImplementation project(':rsocket-test')
2728
testImplementation 'org.junit.jupiter:junit-jupiter-api'
2829
testImplementation 'org.mockito:mockito-core'
2930
testImplementation 'org.assertj:assertj-core'
3031
testImplementation 'io.projectreactor:reactor-test'
31-
testImplementation 'ch.qos.logback:logback-classic'
3232

3333
// TODO: Remove after JUnit5 migration
3434
testCompileOnly 'junit:junit'

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/channel/ChannelEchoClient.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,15 @@
2828
import io.rsocket.util.DefaultPayload;
2929
import java.time.Duration;
3030
import org.reactivestreams.Publisher;
31+
import org.slf4j.Logger;
32+
import org.slf4j.LoggerFactory;
3133
import reactor.core.publisher.Flux;
3234
import reactor.core.publisher.Mono;
3335

3436
public final class ChannelEchoClient {
3537

38+
private static final Logger logger = LoggerFactory.getLogger(ChannelEchoClient.class);
39+
3640
public static void main(String[] args) {
3741
RSocketServer.create(new EchoAcceptor())
3842
.bind(TcpServerTransport.create("localhost", 7000))
@@ -45,7 +49,7 @@ public static void main(String[] args) {
4549
.requestChannel(
4650
Flux.interval(Duration.ofMillis(1000)).map(i -> DefaultPayload.create("Hello")))
4751
.map(Payload::getDataUtf8)
48-
.doOnNext(System.out::println)
52+
.doOnNext(logger::debug)
4953
.take(10)
5054
.doFinally(signalType -> socket.dispose())
5155
.then()

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/requestresponse/HelloWorldClient.java‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,14 @@
2424
import io.rsocket.transport.netty.client.TcpClientTransport;
2525
import io.rsocket.transport.netty.server.TcpServerTransport;
2626
import io.rsocket.util.DefaultPayload;
27+
import org.slf4j.Logger;
28+
import org.slf4j.LoggerFactory;
2729
import reactor.core.publisher.Mono;
2830

2931
public final class HelloWorldClient {
3032

33+
private static final Logger logger = LoggerFactory.getLogger(HelloWorldClient.class);
34+
3135
public static void main(String[] args) {
3236
RSocketServer.create(
3337
(setupPayload, reactiveSocket) ->
@@ -39,7 +43,7 @@ public static void main(String[] args) {
3943
public Mono<Payload> requestResponse(Payload p) {
4044
if (fail) {
4145
fail = false;
42-
return Mono.error(new Throwable());
46+
return Mono.error(new Throwable("Simulated error"));
4347
} else {
4448
return Mono.just(p);
4549
}
@@ -51,26 +55,14 @@ public Mono<Payload> requestResponse(Payload p) {
5155
RSocket socket =
5256
RSocketConnector.connectWith(TcpClientTransport.create("localhost", 7000)).block();
5357

54-
socket
55-
.requestResponse(DefaultPayload.create("Hello"))
56-
.map(Payload::getDataUtf8)
57-
.onErrorReturn("error")
58-
.doOnNext(System.out::println)
59-
.block();
60-
61-
socket
62-
.requestResponse(DefaultPayload.create("Hello"))
63-
.map(Payload::getDataUtf8)
64-
.onErrorReturn("error")
65-
.doOnNext(System.out::println)
66-
.block();
67-
68-
socket
69-
.requestResponse(DefaultPayload.create("Hello"))
70-
.map(Payload::getDataUtf8)
71-
.onErrorReturn("error")
72-
.doOnNext(System.out::println)
73-
.block();
58+
for (int i = 0; i < 3; i++) {
59+
socket
60+
.requestResponse(DefaultPayload.create("Hello"))
61+
.map(Payload::getDataUtf8)
62+
.onErrorReturn("error")
63+
.doOnNext(logger::debug)
64+
.block();
65+
}
7466

7567
socket.dispose();
7668
}

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/resume/Files.java‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,21 @@
33
import io.netty.buffer.ByteBuf;
44
import io.netty.buffer.Unpooled;
55
import io.rsocket.Payload;
6-
import java.io.*;
6+
import java.io.BufferedInputStream;
7+
import java.io.FileNotFoundException;
8+
import java.io.FileOutputStream;
9+
import java.io.IOException;
10+
import java.io.InputStream;
11+
import java.io.OutputStream;
712
import org.reactivestreams.Subscriber;
813
import org.reactivestreams.Subscription;
14+
import org.slf4j.Logger;
15+
import org.slf4j.LoggerFactory;
916
import reactor.core.publisher.Flux;
1017
import reactor.core.publisher.SynchronousSink;
1118

1219
class Files {
20+
private static final Logger logger = LoggerFactory.getLogger(Files.class);
1321

1422
public static Flux<ByteBuf> fileSource(String fileName, int chunkSizeBytes) {
1523
return Flux.generate(
@@ -35,8 +43,7 @@ public void onNext(Payload payload) {
3543
ByteBuf data = payload.data();
3644
receivedBytes += data.readableBytes();
3745
receivedCount += 1;
38-
System.out.println(
39-
"Received file chunk: " + receivedCount + ". Total size: " + receivedBytes);
46+
logger.debug("Received file chunk: " + receivedCount + ". Total size: " + receivedBytes);
4047
if (outputStream == null) {
4148
outputStream = open(fileName);
4249
}

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/resume/ResumeFileTransfer.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,17 @@
2727
import io.rsocket.transport.netty.server.TcpServerTransport;
2828
import io.rsocket.util.DefaultPayload;
2929
import java.time.Duration;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
3032
import reactor.core.publisher.Flux;
3133
import reactor.core.publisher.Mono;
3234
import reactor.util.retry.Retry;
3335

3436
public class ResumeFileTransfer {
37+
3538
/*amount of file chunks requested by subscriber: n, refilled on n/2 of received items*/
3639
private static final int PREFETCH_WINDOW_SIZE = 4;
40+
private static final Logger logger = LoggerFactory.getLogger(ResumeFileTransfer.class);
3741

3842
public static void main(String[] args) {
3943
RequestCodec requestCodec = new RequestCodec();
@@ -44,7 +48,7 @@ public static void main(String[] args) {
4448
Retry.fixedDelay(Long.MAX_VALUE, Duration.ofSeconds(1))
4549
.doBeforeRetry(
4650
retrySignal ->
47-
System.out.println("Disconnected. Trying to resume connection...")));
51+
logger.debug("Disconnected. Trying to resume connection...")));
4852

4953
CloseableChannel server =
5054
RSocketServer.create((setup, rSocket) -> Mono.just(new FileServer(requestCodec)))

‎rsocket-examples/src/main/java/io/rsocket/examples/transport/tcp/stream/StreamingClient.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,15 @@
2727
import io.rsocket.transport.netty.server.TcpServerTransport;
2828
import io.rsocket.util.DefaultPayload;
2929
import java.time.Duration;
30+
import org.slf4j.Logger;
31+
import org.slf4j.LoggerFactory;
3032
import reactor.core.publisher.Flux;
3133
import reactor.core.publisher.Mono;
3234

3335
public final class StreamingClient {
3436

37+
private static final Logger logger = LoggerFactory.getLogger(StreamingClient.class);
38+
3539
public static void main(String[] args) {
3640
RSocketServer.create(new SocketAcceptorImpl())
3741
.bind(TcpServerTransport.create("localhost", 7000))
@@ -43,7 +47,7 @@ public static void main(String[] args) {
4347
socket
4448
.requestStream(DefaultPayload.create("Hello"))
4549
.map(Payload::getDataUtf8)
46-
.doOnNext(System.out::println)
50+
.doOnNext(logger::debug)
4751
.take(10)
4852
.then()
4953
.doFinally(signalType -> socket.dispose())

‎rsocket-examples/src/main/resources/log4j.properties‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎rsocket-examples/src/main/resources/logback.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2015-2020 the original author or authors.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<configuration>
19+
20+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
21+
<encoder>
22+
<pattern>%d{dd MMM yyyy HH:mm:ss,SSS} %5p [%t] %c{1} - %m%n</pattern>
23+
</encoder>
24+
</appender>
25+
26+
<logger name="io.rsocket.examples" level="DEBUG"/>
27+
28+
<!-- Set this to DEBUG to log frames -->
29+
<logger name="io.rsocket.FrameLogger" level="INFO"/>
30+
31+
<root level="INFO">
32+
<appender-ref ref="STDOUT"/>
33+
</root>
34+
35+
</configuration>

‎rsocket-examples/src/test/resources/log4j.properties‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎rsocket-examples/src/test/resources/logback-test.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright 2015-2020 the original author or authors.
4+
~
5+
~ Licensed under the Apache License, Version 2.0 (the "License");
6+
~ you may not use this file except in compliance with the License.
7+
~ You may obtain a copy of the License at
8+
~
9+
~ http://www.apache.org/licenses/LICENSE-2.0
10+
~
11+
~ Unless required by applicable law or agreed to in writing, software
12+
~ distributed under the License is distributed on an "AS IS" BASIS,
13+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
~ See the License for the specific language governing permissions and
15+
~ limitations under the License.
16+
-->
17+
18+
<configuration>
19+
20+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
21+
<encoder>
22+
<pattern>%d{dd MMM yyyy HH:mm:ss,SSS} %5p [%t] %c{1} - %m%n</pattern>
23+
</encoder>
24+
</appender>
25+
26+
<logger name="io.rsocket.examples" level="DEBUG"/>
27+
<logger name="io.rsocket.FrameLogger" level="INFO"/>
28+
29+
<root level="INFO">
30+
<appender-ref ref="STDOUT"/>
31+
</root>
32+
33+
</configuration>

0 commit comments

Comments
 (0)