Skip to content

Commit e4b9141

Browse files
committed
Fixed tests
1 parent 005a3ac commit e4b9141

File tree

4 files changed

+36
-28
lines changed

4 files changed

+36
-28
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
env:
2+
global:
3+
- servicesLogLevel=warn
4+
- clusterLogLevel=warn
15
addons:
26
apt:
37
packages:

services-discovery/src/test/resources/log4j2-test.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@
1010
</Appenders>
1111

1212
<Loggers>
13-
<Logger name="io.scalecube.seed" level="${env:seedLogLevel:-WARN}"/>
14-
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-WARN}"/>
15-
<Logger name="io.scalecube.transport" level="${env:servicesTransportLogLevel:-WARN}"/>
16-
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-WARN}"/>
17-
<Logger name="io.scalecube.config" level="${env:configLogLevel:-WARN}"/>
18-
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-WARN}"/>
19-
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-WARN}"/>
20-
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-WARN}"/>
21-
<Logger name="io.netty" level="${env:nettyLogLevel:-WARN}"/>
22-
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-WARN}"/>
23-
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-WARN}"/>
24-
<logger name="io.rsocket" level="${env:rsocketLogLevel:-WARN}"/>
13+
<Logger name="io.scalecube.services.BaseTest" level="info"/>
14+
<Logger name="io.scalecube.services.discovery.BaseTest" level="info"/>
15+
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-info}"/>
16+
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-info}"/>
17+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-warn}"/>
18+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-warn}"/>
19+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-warn}"/>
20+
<Logger name="io.netty" level="${env:nettyLogLevel:-warn}"/>
21+
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-warn}"/>
22+
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-warn}"/>
23+
<logger name="io.rsocket" level="${env:rsocketLogLevel:-warn}"/>
2524

26-
<Root level="${env:logLevel:-DEBUG}">
25+
<Root level="${env:logLevel:-debug}">
2726
<AppenderRef ref="${env:logAppender:-console}"/>
2827
</Root>
2928
</Loggers>

services/src/main/java/io/scalecube/services/Microservices.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,11 @@ private Mono<ServiceDiscovery> createInstance(ServiceEndpoint serviceEndpoint) {
445445
private Mono<ServiceDiscovery> startListen(Microservices microservices) {
446446
return Mono.defer(
447447
() -> {
448+
if (discovery == null) {
449+
LOGGER.info("[{}] ServiceDiscovery not set", microservices.id());
450+
return Mono.empty();
451+
}
452+
448453
disposable =
449454
discovery
450455
.listenDiscovery()
@@ -579,10 +584,11 @@ public ServiceTransportBootstrap(Supplier<ServiceTransport> supplier) {
579584
}
580585

581586
private Mono<ServiceTransportBootstrap> start(Microservices microservices) {
582-
if (supplier == NULL_SUPPLIER) {
587+
if (supplier == NULL_SUPPLIER || (serviceTransport = supplier.get()) == null) {
588+
LOGGER.info("[{}] ServiceTransport not set", microservices.id());
583589
return Mono.just(NULL_INSTANCE);
584590
}
585-
serviceTransport = supplier.get();
591+
586592
return serviceTransport
587593
.start()
588594
.doOnSuccess(transport -> serviceTransport = transport)

services/src/test/resources/log4j2-test.xml

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,19 @@
1010
</Appenders>
1111

1212
<Loggers>
13-
<Logger name="io.scalecube.seed" level="${env:seedLogLevel:-WARN}"/>
14-
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-WARN}"/>
15-
<Logger name="io.scalecube.transport" level="${env:servicesTransportLogLevel:-WARN}"/>
16-
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-WARN}"/>
17-
<Logger name="io.scalecube.config" level="${env:configLogLevel:-WARN}"/>
18-
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-WARN}"/>
19-
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-WARN}"/>
20-
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-WARN}"/>
21-
<Logger name="io.netty" level="${env:nettyLogLevel:-WARN}"/>
22-
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-WARN}"/>
23-
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-WARN}"/>
24-
<logger name="io.rsocket" level="${env:rsocketLogLevel:-WARN}"/>
13+
<Logger name="io.scalecube.services.BaseTest" level="info"/>
14+
<Logger name="io.scalecube.services.discovery.BaseTest" level="info"/>
15+
<Logger name="io.scalecube.services" level="${env:servicesLogLevel:-info}"/>
16+
<Logger name="io.scalecube.cluster" level="${env:clusterLogLevel:-info}"/>
17+
<Logger name="reactor.util" level="${env:reactorUtilLogLevel:-warn}"/>
18+
<Logger name="reactor.core" level="${env:reactorCoreLogLevel:-warn}"/>
19+
<Logger name="reactor.netty" level="${env:reactorNettyLogLevel:-warn}"/>
20+
<Logger name="io.netty" level="${env:nettyLogLevel:-warn}"/>
21+
<logger name="io.rsocket.transport.netty" level="${env:rsocketTransportNettyLogLevel:-warn}"/>
22+
<logger name="io.rsocket.FrameLogger" level="${env:rsocketFrameLoggerLogLevel:-warn}"/>
23+
<logger name="io.rsocket" level="${env:rsocketLogLevel:-warn}"/>
2524

26-
<Root level="${env:logLevel:-DEBUG}">
25+
<Root level="${env:logLevel:-debug}">
2726
<AppenderRef ref="${env:logAppender:-console}"/>
2827
</Root>
2928
</Loggers>

0 commit comments

Comments
 (0)