Skip to content

Commit

Permalink
fix feedback - remove [] for host, details EOL.
Browse files Browse the repository at this point in the history
  • Loading branch information
@praveenag
praveenag committed Sep 4, 2017
1 parent a695b0e commit 376fb39
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 57 deletions.
26 changes: 13 additions & 13 deletions community/bolt/src/main/java/org/neo4j/bolt/logging/BoltMessageLog.java
View file
Expand Up @@ -54,66 +54,66 @@ public BoltMessageLog( FileSystemAbstraction fileSystem, File logFile, Executor


public void error( String remoteAddress, String message ) public void error( String remoteAddress, String message )
{ {
inner.error( "[%s] %s", remoteAddress, message ); inner.error( "%s %s", remoteAddress, message );
} }


public void error( String remoteAddress, String message, String arg1 ) public void error( String remoteAddress, String message, String arg1 )
{ {
inner.error( "[%s] %s %s", remoteAddress, message, arg1 ); inner.error( "%s %s %s", remoteAddress, message, arg1 );
} }


public void error( String remoteAddress, String message, String arg1, String arg2 ) public void error( String remoteAddress, String message, String arg1, String arg2 )
{ {
inner.error( "[%s] %s %s %s", remoteAddress, message, arg1, arg2 ); inner.error( "%s %s %s %s", remoteAddress, message, arg1, arg2 );
} }


public void warn( String remoteAddress, String message ) public void warn( String remoteAddress, String message )
{ {
inner.warn( "[%s] %s", remoteAddress, message ); inner.warn( "%s %s", remoteAddress, message );
} }


public void warn( String remoteAddress, String message, String arg1 ) public void warn( String remoteAddress, String message, String arg1 )
{ {
inner.warn( "[%s] %s %s", remoteAddress, message, arg1 ); inner.warn( "%s %s %s", remoteAddress, message, arg1 );
} }


public void warn( String remoteAddress, String message, String arg1, String arg2 ) public void warn( String remoteAddress, String message, String arg1, String arg2 )
{ {
inner.warn( "[%s] %s %s %s", remoteAddress, message, arg1, arg2 ); inner.warn( "%s %s %s %s", remoteAddress, message, arg1, arg2 );
} }


public void info( String remoteAddress, String message ) public void info( String remoteAddress, String message )
{ {
inner.info( "[%s] %s", remoteAddress, message ); inner.info( "%s %s", remoteAddress, message );
} }


public void info( String remoteAddress, String message, String arg1 ) public void info( String remoteAddress, String message, String arg1 )
{ {
inner.info( "[%s] %s %s", remoteAddress, message, arg1 ); inner.info( "%s %s %s", remoteAddress, message, arg1 );
} }


public void info( String remoteAddress, String message, String arg1, String arg2 ) public void info( String remoteAddress, String message, String arg1, String arg2 )
{ {
inner.info( "[%s] %s %s %s", remoteAddress, message, arg1, arg2 ); inner.info( "%s %s %s %s", remoteAddress, message, arg1, arg2 );
} }


public void info( String remoteAddress, String message, String arg1, String arg2, String arg3 ) public void info( String remoteAddress, String message, String arg1, String arg2, String arg3 )
{ {
inner.info( "[%s] %s %s %s", remoteAddress, message, arg1, arg2, arg3 ); inner.info( "%s %s %s %s", remoteAddress, message, arg1, arg2, arg3 );
} }


public void debug( String remoteAddress, String message ) public void debug( String remoteAddress, String message )
{ {
inner.debug( "[%s] %s", remoteAddress, message ); inner.debug( "%s %s", remoteAddress, message );
} }


public void debug( String remoteAddress, String message, String arg1 ) public void debug( String remoteAddress, String message, String arg1 )
{ {
inner.debug( "[%s] %s %s", remoteAddress, message, arg1 ); inner.debug( "%s %s %s", remoteAddress, message, arg1 );
} }


public void debug( String remoteAddress, String message, String arg1, String arg2 ) public void debug( String remoteAddress, String message, String arg1, String arg2 )
{ {
inner.debug( "[%s] %s %s %s", remoteAddress, message, arg1, arg2 ); inner.debug( "%s %s %s %s", remoteAddress, message, arg1, arg2 );
} }
} }
49 changes: 23 additions & 26 deletions community/bolt/src/main/java/org/neo4j/bolt/logging/BoltMessageLoggerImpl.java
View file
Expand Up @@ -41,6 +41,7 @@
class BoltMessageLoggerImpl implements BoltMessageLogger class BoltMessageLoggerImpl implements BoltMessageLogger
{ {
private static final ObjectMapper jsonObjectMapper = new ObjectMapper(); private static final ObjectMapper jsonObjectMapper = new ObjectMapper();
public static final Supplier<String> PLACEHOLDER_DETAIL_SUPPLIER = () -> "-";
private final BoltMessageLog messageLog; private final BoltMessageLog messageLog;


private final String remoteAddress; private final String remoteAddress;
Expand All @@ -60,13 +61,13 @@ class BoltMessageLoggerImpl implements BoltMessageLogger
@Override @Override
public void clientEvent( String eventName ) public void clientEvent( String eventName )
{ {
infoLogger().accept( format( "C: <%s>", eventName ) ); clientEvent( eventName, PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void clientEvent( String eventName, Supplier<String> detailsSupplier ) public void clientEvent( String eventName, Supplier<String> detailsSupplier )
{ {
infoLoggerWithArgs().accept( format( "C: <%s>", eventName ), detailsSupplier.get() ); infoLoggerWithDetails().accept( format( "C: %s", eventName ), detailsSupplier.get() );
} }


@Override @Override
Expand All @@ -78,13 +79,13 @@ public void clientError( String eventName, String errorMessage, Supplier<String>
@Override @Override
public void serverEvent( String eventName ) public void serverEvent( String eventName )
{ {
infoLogger().accept( format( "S: <%s>", eventName ) ); serverEvent( eventName, PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void serverEvent( String eventName, Supplier<String> detailsSupplier ) public void serverEvent( String eventName, Supplier<String> detailsSupplier )
{ {
infoLoggerWithArgs().accept( format( "S: <%s>", eventName ), detailsSupplier.get() ); infoLoggerWithDetails().accept( format( "S: %s", eventName ), detailsSupplier.get() );
} }


@Override @Override
Expand All @@ -103,90 +104,86 @@ public void serverError( String eventName, Status status, String errorMessage )
public void logInit( String userAgent, Map<String,Object> authToken ) public void logInit( String userAgent, Map<String,Object> authToken )
{ {
// log only auth toke keys, not values that include password // log only auth toke keys, not values that include password
infoLoggerWithArgs().accept( "C: INIT", format( "%s %s", userAgent, json( authToken.keySet() ) ) ); clientEvent( "INIT", () -> format( "%s %s", userAgent, json( authToken.keySet() ) ) );
} }


@Override @Override
public void logRun( String statement, Map<String,Object> parameters ) public void logRun( String statement, Map<String,Object> parameters )
{ {
infoLoggerWithArgs().accept( "C: RUN", format( "%s %s", statement, json( parameters ) ) ); clientEvent( "RUN", () -> format( "%s %s", statement, json( parameters ) ) );
} }


@Override @Override
public void logPullAll() public void logPullAll()
{ {
infoLogger().accept( "C: PULL_ALL" ); clientEvent( "PULL_ALL", PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void logDiscardAll() public void logDiscardAll()
{ {
infoLogger().accept( "C: DISCARD_ALL" ); clientEvent( "DISCARD_ALL", PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void logAckFailure() public void logAckFailure()
{ {
infoLogger().accept( "C: ACK_FAILURE" ); clientEvent( "ACK_FAILURE", PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void logReset() public void logReset()
{ {
infoLogger().accept( "C: RESET" ); clientEvent( "RESET", PLACEHOLDER_DETAIL_SUPPLIER );
} }


@Override @Override
public void logSuccess( Object metadata ) public void logSuccess( Object metadata )
{ {
infoLoggerWithArgs().accept( "S: SUCCESS", json( metadata ) ); serverEvent( "SUCCESS", () -> json( metadata ) );
} }


@Override @Override
public void logFailure( Status status, String errorMessage ) public void logFailure( Status status, String errorMessage )
{ {
infoLoggerWithArgs().accept( "S: FAILURE", format( "%s %s", status.code().serialize(), errorMessage ) ); serverEvent( "FAILURE", () -> format( "%s %s", status.code().serialize(), errorMessage ) );
} }


@Override @Override
public void logIgnored() public void logIgnored()
{ {
infoLogger().accept( "S: IGNORED" ); serverEvent( "IGNORED", PLACEHOLDER_DETAIL_SUPPLIER );
} }


private Consumer<String> infoLogger() private Consumer<String> errorLogger( String errorMessage )
{ {
if ( !channel.hasAttr( CORRELATION_ATTRIBUTE_KEY ) ) if ( !channel.hasAttr( CORRELATION_ATTRIBUTE_KEY ) )
{ {
channel.attr( CORRELATION_ATTRIBUTE_KEY ).set( randomCorrelationIdGenerator() ); channel.attr( CORRELATION_ATTRIBUTE_KEY ).set( randomCorrelationIdGenerator() );
} }


String boltXCorrelationId = channel.attr( CORRELATION_ATTRIBUTE_KEY ).get(); String boltCorrelationId = channel.attr( CORRELATION_ATTRIBUTE_KEY ).get();
return formatMessageWithEventName -> return formatMessageWithEventName ->
messageLog.info( remoteAddress, formatMessageWithEventName, boltXCorrelationId ); messageLog.error( remoteAddress, errorMessage, formatMessageWithEventName, boltCorrelationId );
} }


private String randomCorrelationIdGenerator() private String randomCorrelationIdGenerator()
{ {
return UUID.randomUUID().toString(); return UUID.randomUUID().toString();
} }


private BiConsumer<String, String> infoLoggerWithArgs() private BiConsumer<String, String> infoLoggerWithDetails()
{
return ( formatMessageWithEventName, details ) ->
infoLogger().accept( format( "%s %s", formatMessageWithEventName, details ) );
}

private Consumer<String> errorLogger( String errorMessage )
{ {
if ( !channel.hasAttr( CORRELATION_ATTRIBUTE_KEY ) ) if ( !channel.hasAttr( CORRELATION_ATTRIBUTE_KEY ) )
{ {
channel.attr( CORRELATION_ATTRIBUTE_KEY ).set( randomCorrelationIdGenerator() ); channel.attr( CORRELATION_ATTRIBUTE_KEY ).set( randomCorrelationIdGenerator() );
} }


String boltXCorrelationId = channel.attr( CORRELATION_ATTRIBUTE_KEY ).get(); String boltCorrelationId = channel.attr( CORRELATION_ATTRIBUTE_KEY ).get();
return formatMessageWithEventName -> return ( formatMessageWithEventName, details ) ->
messageLog.error( remoteAddress, errorMessage, formatMessageWithEventName, boltXCorrelationId ); messageLog.info( remoteAddress,
boltCorrelationId,
format( "%s %s", formatMessageWithEventName, details ) );
} }


private BiConsumer<String, String> errorLoggerWithArgs( String errorMessage ) private BiConsumer<String, String> errorLoggerWithArgs( String errorMessage )
Expand Down

0 comments on commit 376fb39

Please sign in to comment.