Skip to content

Commit b90c31c

Browse files
author
Zhen
committed
Fix after review
1 parent 3dcf9c5 commit b90c31c

File tree

4 files changed

+17
-203
lines changed

4 files changed

+17
-203
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancer;
3838
import org.neo4j.driver.internal.cluster.loadbalancing.LoadBalancingStrategy;
3939
import org.neo4j.driver.internal.cluster.loadbalancing.RoundRobinLoadBalancingStrategy;
40-
import org.neo4j.driver.internal.logging.DelegateLogging;
40+
import org.neo4j.driver.internal.logging.NettyLogging;
4141
import org.neo4j.driver.internal.retry.ExponentialBackoffRetryLogic;
4242
import org.neo4j.driver.internal.retry.RetryLogic;
4343
import org.neo4j.driver.internal.retry.RetrySettings;
@@ -71,7 +71,7 @@ public final Driver newInstance( URI uri, AuthToken authToken, RoutingSettings r
7171
RoutingSettings newRoutingSettings = routingSettings.withRoutingContext( new RoutingContext( uri ) );
7272
SecurityPlan securityPlan = createSecurityPlan( address, config );
7373

74-
InternalLoggerFactory.setDefaultFactory( new DelegateLogging( config.logging() ) );
74+
InternalLoggerFactory.setDefaultFactory( new NettyLogging( config.logging() ) );
7575
Bootstrap bootstrap = createBootstrap();
7676
EventExecutorGroup eventExecutorGroup = bootstrap.config().group();
7777
RetryLogic retryLogic = createRetryLogic( retrySettings, eventExecutorGroup, config.logging() );

‎driver/src/main/java/org/neo4j/driver/internal/InternalDriver.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ public class InternalDriver implements Driver
4444
this.securityPlan = securityPlan;
4545
this.sessionFactory = sessionFactory;
4646
this.log = logging.getLog( Driver.class.getSimpleName() );
47+
log.info( "Driver instance %s created", this );
4748
}
4849

4950
@Override

‎driver/src/main/java/org/neo4j/driver/internal/logging/DelegateLogger.java‎ renamed to ‎driver/src/main/java/org/neo4j/driver/internal/logging/NettyLogger.java‎

Lines changed: 11 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,24 @@
1818
*/
1919
package org.neo4j.driver.internal.logging;
2020

21-
import io.netty.util.internal.logging.InternalLogLevel;
22-
import io.netty.util.internal.logging.InternalLogger;
21+
import io.netty.util.internal.logging.AbstractInternalLogger;
22+
23+
import java.util.regex.Pattern;
2324

2425
import org.neo4j.driver.v1.Logger;
2526

2627
import static java.lang.String.format;
2728

2829

29-
public class DelegateLogger implements InternalLogger
30+
public class NettyLogger extends AbstractInternalLogger
3031
{
3132
private Logger log;
32-
public DelegateLogger( Logger log )
33-
{
34-
this.log = log;
35-
}
33+
private static final Pattern PLACE_HOLDER_PATTERN = Pattern.compile("\\{\\}");
3634

37-
@Override
38-
public String name()
35+
public NettyLogger( String name, Logger log )
3936
{
40-
return null;
37+
super( name );
38+
this.log = log;
4139
}
4240

4341
@Override
@@ -76,12 +74,6 @@ public void trace( String msg, Throwable t )
7674
log.trace( "%s%n%s", msg, t );
7775
}
7876

79-
@Override
80-
public void trace( Throwable t )
81-
{
82-
trace( t.getMessage(), t );
83-
}
84-
8577
@Override
8678
public boolean isDebugEnabled()
8779
{
@@ -118,12 +110,6 @@ public void debug( String msg, Throwable t )
118110
log.debug( "%s%n%s", msg, t );
119111
}
120112

121-
@Override
122-
public void debug( Throwable t )
123-
{
124-
debug( t.getMessage(), t );
125-
}
126-
127113
@Override
128114
public boolean isInfoEnabled()
129115
{
@@ -160,12 +146,6 @@ public void info( String msg, Throwable t )
160146
log.info( "%s%n%s", msg, t );
161147
}
162148

163-
@Override
164-
public void info( Throwable t )
165-
{
166-
info( t.getMessage(), t );
167-
}
168-
169149
@Override
170150
public boolean isWarnEnabled()
171151
{
@@ -202,12 +182,6 @@ public void warn( String msg, Throwable t )
202182
log.warn( "%s%n%s", msg, t );
203183
}
204184

205-
@Override
206-
public void warn( Throwable t )
207-
{
208-
warn( t.getMessage(), t );
209-
}
210-
211185
@Override
212186
public boolean isErrorEnabled()
213187
{
@@ -235,7 +209,7 @@ public void error( String format, Object argA, Object argB )
235209
@Override
236210
public void error( String format, Object... arguments )
237211
{
238-
format = toDriverLoggerFormat(format);
212+
format = toDriverLoggerFormat( format );
239213
if ( arguments.length == 0 )
240214
{
241215
log.error( format, null );
@@ -247,7 +221,7 @@ public void error( String format, Object... arguments )
247221
{
248222
// still give all arguments to string format,
249223
// for the worst case, the redundant parameter will be ignored.
250-
log.error( format(format, arguments), (Throwable) arg );
224+
log.error( format( format, arguments ), (Throwable) arg );
251225
}
252226
}
253227

@@ -257,169 +231,8 @@ public void error( String msg, Throwable t )
257231
log.error( msg, t );
258232
}
259233

260-
@Override
261-
public void error( Throwable t )
262-
{
263-
error( t.getMessage(), t );
264-
}
265-
266-
@Override
267-
public boolean isEnabled( InternalLogLevel level )
268-
{
269-
if ( level == InternalLogLevel.TRACE )
270-
{
271-
return isTraceEnabled();
272-
}
273-
else if ( level == InternalLogLevel.DEBUG )
274-
{
275-
return isDebugEnabled();
276-
}
277-
else
278-
{
279-
return true;
280-
}
281-
}
282-
283-
@Override
284-
public void log( InternalLogLevel level, String msg )
285-
{
286-
switch ( level )
287-
{
288-
case TRACE:
289-
trace( msg );
290-
break;
291-
case DEBUG:
292-
debug( msg );
293-
break;
294-
case INFO:
295-
info( msg );
296-
break;
297-
case WARN:
298-
warn( msg );
299-
break;
300-
case ERROR:
301-
error( msg );
302-
break;
303-
}
304-
}
305-
306-
@Override
307-
public void log( InternalLogLevel level, String format, Object arg )
308-
{
309-
switch ( level )
310-
{
311-
case TRACE:
312-
trace( format, arg );
313-
break;
314-
case DEBUG:
315-
debug( format, arg );
316-
break;
317-
case INFO:
318-
info( format, arg );
319-
break;
320-
case WARN:
321-
warn( format, arg );
322-
break;
323-
case ERROR:
324-
error( format, arg );
325-
break;
326-
}
327-
}
328-
329-
@Override
330-
public void log( InternalLogLevel level, String format, Object argA, Object argB )
331-
{
332-
switch ( level )
333-
{
334-
case TRACE:
335-
trace( format, argA, argB );
336-
break;
337-
case DEBUG:
338-
debug( format, argA, argB );
339-
break;
340-
case INFO:
341-
info( format, argA, argB );
342-
break;
343-
case WARN:
344-
warn( format, argA, argB );
345-
break;
346-
case ERROR:
347-
error( format, argA, argB );
348-
break;
349-
}
350-
}
351-
352-
@Override
353-
public void log( InternalLogLevel level, String format, Object... arguments )
354-
{
355-
switch ( level )
356-
{
357-
case TRACE:
358-
trace( format, arguments );
359-
break;
360-
case DEBUG:
361-
debug( format, arguments );
362-
break;
363-
case INFO:
364-
info( format, arguments );
365-
break;
366-
case WARN:
367-
warn( format, arguments );
368-
break;
369-
case ERROR:
370-
error( format, arguments );
371-
break;
372-
}
373-
}
374-
375-
@Override
376-
public void log( InternalLogLevel level, String msg, Throwable t )
377-
{
378-
switch ( level )
379-
{
380-
case TRACE:
381-
trace( msg, t );
382-
break;
383-
case DEBUG:
384-
debug( msg, t );
385-
break;
386-
case INFO:
387-
info( msg, t );
388-
break;
389-
case WARN:
390-
warn( msg, t );
391-
break;
392-
case ERROR:
393-
error( msg, t );
394-
break;
395-
}
396-
}
397-
398-
@Override
399-
public void log( InternalLogLevel level, Throwable t )
400-
{
401-
switch ( level )
402-
{
403-
case TRACE:
404-
trace( t );
405-
break;
406-
case DEBUG:
407-
debug( t );
408-
break;
409-
case INFO:
410-
info( t );
411-
break;
412-
case WARN:
413-
warn( t );
414-
break;
415-
case ERROR:
416-
error( t );
417-
break;
418-
}
419-
}
420-
421234
private String toDriverLoggerFormat( String format )
422235
{
423-
return format.replaceAll( "\\{\\}", "%s" );
236+
return PLACE_HOLDER_PATTERN.matcher( format ).replaceAll( "%s" );
424237
}
425238
}

‎driver/src/main/java/org/neo4j/driver/internal/logging/DelegateLogging.java‎ renamed to ‎driver/src/main/java/org/neo4j/driver/internal/logging/NettyLogging.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626
/**
2727
* This is the logging factory to delegate netty's logging to our logging system
2828
*/
29-
public class DelegateLogging extends InternalLoggerFactory
29+
public class NettyLogging extends InternalLoggerFactory
3030
{
3131
private Logging logging;
3232

33-
public DelegateLogging( Logging logging )
33+
public NettyLogging( Logging logging )
3434
{
3535
this.logging = logging;
3636
}
3737

3838
@Override
3939
protected InternalLogger newInstance( String name )
4040
{
41-
return new DelegateLogger( logging.getLog( name ) );
41+
return new NettyLogger( name, logging.getLog( name ) );
4242
}
4343
}

0 commit comments

Comments
 (0)