25
import java .time .Clock ;
25
import java .time .Clock ;
26
import java .util .Map ;
26
import java .util .Map ;
27
27
28
- import org .neo4j .bolt .logging .BoltMessageLogging ;
29
import org .neo4j .bolt .runtime .BoltConnectionFactory ;
28
import org .neo4j .bolt .runtime .BoltConnectionFactory ;
30
import org .neo4j .bolt .runtime .BoltConnectionReadLimiter ;
29
import org .neo4j .bolt .runtime .BoltConnectionReadLimiter ;
31
import org .neo4j .bolt .runtime .BoltSchedulerProvider ;
30
import org .neo4j .bolt .runtime .BoltSchedulerProvider ;
@@ -113,8 +112,6 @@ public void start() throws Throwable
113
Log userLog = logService .getUserLog ( BoltServer .class );
112
Log userLog = logService .getUserLog ( BoltServer .class );
114
113
115
InternalLoggerFactory .setDefaultFactory ( new Netty4LoggerFactory ( logService .getInternalLogProvider () ) );
114
InternalLoggerFactory .setDefaultFactory ( new Netty4LoggerFactory ( logService .getInternalLogProvider () ) );
116
- BoltMessageLogging boltLogging = BoltMessageLogging .create ( fs , jobScheduler , config , log );
117
- life .add ( boltLogging );
118
115
119
Authentication authentication = createAuthentication ();
116
Authentication authentication = createAuthentication ();
120
117
@@ -131,7 +128,7 @@ public void start() throws Throwable
131
if ( !config .enabledBoltConnectors ().isEmpty () && !config .get ( GraphDatabaseSettings .disconnected ) )
128
if ( !config .enabledBoltConnectors ().isEmpty () && !config .get ( GraphDatabaseSettings .disconnected ) )
132
{
129
{
133
NettyServer server = new NettyServer ( jobScheduler .threadFactory ( boltNetworkIO ),
130
NettyServer server = new NettyServer ( jobScheduler .threadFactory ( boltNetworkIO ),
134
- createConnectors ( boltProtocolFactory , throttleGroup , boltLogging , log ), connectorPortRegister , userLog );
131
+ createConnectors ( boltProtocolFactory , throttleGroup , log ), connectorPortRegister , userLog );
135
life .add ( server );
132
life .add ( server );
136
log .info ( "Bolt server loaded" );
133
log .info ( "Bolt server loaded" );
137
}
134
}
@@ -155,15 +152,15 @@ private BoltConnectionFactory createConnectionFactory( Config config, BoltSchedu
155
}
152
}
156
153
157
private Map <BoltConnector ,ProtocolInitializer > createConnectors ( BoltProtocolFactory boltProtocolFactory ,
154
private Map <BoltConnector ,ProtocolInitializer > createConnectors ( BoltProtocolFactory boltProtocolFactory ,
158
- TransportThrottleGroup throttleGroup , BoltMessageLogging boltLogging , Log log )
155
+ TransportThrottleGroup throttleGroup , Log log )
159
{
156
{
160
return config .enabledBoltConnectors ()
157
return config .enabledBoltConnectors ()
161
.stream ()
158
.stream ()
162
- .collect ( toMap ( identity (), connector -> createProtocolInitializer ( connector , boltProtocolFactory , throttleGroup , boltLogging , log ) ) );
159
+ .collect ( toMap ( identity (), connector -> createProtocolInitializer ( connector , boltProtocolFactory , throttleGroup , log ) ) );
163
}
160
}
164
161
165
private ProtocolInitializer createProtocolInitializer ( BoltConnector connector , BoltProtocolFactory boltProtocolFactory ,
162
private ProtocolInitializer createProtocolInitializer ( BoltConnector connector , BoltProtocolFactory boltProtocolFactory ,
166
- TransportThrottleGroup throttleGroup , BoltMessageLogging boltLogging , Log log )
163
+ TransportThrottleGroup throttleGroup , Log log )
167
{
164
{
168
SslContext sslCtx ;
165
SslContext sslCtx ;
169
boolean requireEncryption ;
166
boolean requireEncryption ;
@@ -199,7 +196,7 @@ private ProtocolInitializer createProtocolInitializer( BoltConnector connector,
199
}
196
}
200
197
201
ListenSocketAddress listenAddress = config .get ( connector .listen_address );
198
ListenSocketAddress listenAddress = config .get ( connector .listen_address );
202
- return new SocketTransport ( connector .key (), listenAddress , sslCtx , requireEncryption , logService .getInternalLogProvider (), boltLogging ,
199
+ return new SocketTransport ( connector .key (), listenAddress , sslCtx , requireEncryption , logService .getInternalLogProvider (),
203
throttleGroup , boltProtocolFactory , connectionTracker );
200
throttleGroup , boltProtocolFactory , connectionTracker );
204
}
201
}
205
202
0 commit comments