Skip to content

Commit 348da58

Browse files
author
Zhen
committed
Added a simple DelegateLogging to directly pass netty's log into our logging system
While as netty use `{}` instead of `%s`, we cannot print their log message properly. This PR did not address the conversion between two logging systems.
1 parent b92eac3 commit 348da58

File tree

6 files changed

+465
-7
lines changed

6 files changed

+465
-7
lines changed

driver/src/main/java/org/neo4j/driver/internal/DriverFactory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
import io.netty.bootstrap.Bootstrap;
2222
import io.netty.util.concurrent.EventExecutorGroup;
23+
import io.netty.util.internal.logging.InternalLoggerFactory;
2324

2425
import java.io.IOException;
2526
import java.net.URI;
@@ -36,6 +37,7 @@
3637
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3738
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancingStrategy;
3839
import org.neo4j.driver.internal.cluster.loadbalancing.RoundRobinLoadBalancingStrategy;
40+
import org.neo4j.driver.internal.logging.DelegateLogging;
3941
import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
4042
import org.neo4j.driver.internal.retry.RetryLogic;
4143
import org.neo4j.driver.internal.retry.RetrySettings;
@@ -69,6 +71,7 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
6971
RoutingSettings newRoutingSettings = routingSettings.withRoutingContext( new RoutingContext( uri ) );
7072
SecurityPlan securityPlan = createSecurityPlan( address, config );
7173

74+
InternalLoggerFactory.setDefaultFactory( new DelegateLogging( config.logging() ) );
7275
Bootstrap bootstrap = createBootstrap();
7376
EventExecutorGroup eventExecutorGroup = bootstrap.config().group();
7477
RetryLogic retryLogic = createRetryLogic( retrySettings, eventExecutorGroup, config.logging() );

driver/src/main/java/org/neo4j/driver/internal/async/ChannelConnectorImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public ChannelConnectorImpl( ConnectionSettings connectionSettings, SecurityPlan
7171
public ChannelFuture connect( BoltServerAddress address, Bootstrap bootstrap )
7272
{
7373
bootstrap.option( ChannelOption.CONNECT_TIMEOUT_MILLIS, connectTimeoutMillis );
74-
bootstrap.handler( new NettyChannelInitializer( address, securityPlan, clock ) );
74+
bootstrap.handler( new NettyChannelInitializer( address, securityPlan, clock, logging ) );
7575

7676
ChannelFuture channelConnected = bootstrap.connect( address.toSocketAddress() );
7777

driver/src/main/java/org/neo4j/driver/internal/async/NettyChannelInitializer.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,25 @@
2929
import org.neo4j.driver.internal.async.inbound.InboundMessageDispatcher;
3030
import org.neo4j.driver.internal.security.SecurityPlan;
3131
import org.neo4j.driver.internal.util.Clock;
32+
import org.neo4j.driver.v1.Logging;
3233

3334
import static org.neo4j.driver.internal.async.ChannelAttributes.setCreationTimestamp;
3435
import static org.neo4j.driver.internal.async.ChannelAttributes.setMessageDispatcher;
3536
import static org.neo4j.driver.internal.async.ChannelAttributes.setServerAddress;
36-
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
3737

3838
public class NettyChannelInitializer extends ChannelInitializer<Channel>
3939
{
4040
private final BoltServerAddress address;
4141
private final SecurityPlan securityPlan;
4242
private final Clock clock;
43+
private final Logging logging;
4344

44-
public NettyChannelInitializer( BoltServerAddress address, SecurityPlan securityPlan, Clock clock )
45+
public NettyChannelInitializer( BoltServerAddress address, SecurityPlan securityPlan, Clock clock, Logging logging )
4546
{
4647
this.address = address;
4748
this.securityPlan = securityPlan;
4849
this.clock = clock;
50+
this.logging = logging;
4951
}
5052

5153
@Override
@@ -78,6 +80,6 @@ private void updateChannelAttributes( Channel channel )
7880
{
7981
setServerAddress( channel, address );
8082
setCreationTimestamp( channel, clock.millis() );
81-
setMessageDispatcher( channel, new InboundMessageDispatcher( channel, DEV_NULL_LOGGING ) );
83+
setMessageDispatcher( channel, new InboundMessageDispatcher( channel, logging ) );
8284
}
8385
}

0 commit comments

Comments
 (0)