Skip to content

Always log the message received from the server before handling the message #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2016
Merged

Always log the message received from the server before handling the message #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions driver/src/main/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,70 +43,70 @@ public LoggingResponseHandler( Logger logger )
@Override
public void handleInitMessage( String clientNameAndVersion, Map<String,Value> authToken )
{
super.handleInitMessage( clientNameAndVersion, authToken );
logger.debug( "S: [INIT \"%s\"]", clientNameAndVersion );
super.handleInitMessage( clientNameAndVersion, authToken );
}

@Override
public void handleRunMessage( String statement, Map<String,Value> parameters )
{
super.handleRunMessage( statement, parameters );
logger.debug( "S: [RUN \"%s\" %s]", statement, parameters );
super.handleRunMessage( statement, parameters );
}

@Override
public void handlePullAllMessage()
{
super.handlePullAllMessage();
logger.debug( DEFAULT_DEBUG_LOGGING_FORMAT, PULL_ALL );
super.handlePullAllMessage();
}

@Override
public void handleDiscardAllMessage()
{
super.handleDiscardAllMessage();
logger.debug( DEFAULT_DEBUG_LOGGING_FORMAT, DISCARD_ALL );
super.handleDiscardAllMessage();
}

@Override
public void handleResetMessage()
{
super.handleResetMessage();
logger.debug( DEFAULT_DEBUG_LOGGING_FORMAT, RESET );
super.handleResetMessage();
}

@Override
public void handleAckFailureMessage()
{
super.handleAckFailureMessage();
logger.debug( DEFAULT_DEBUG_LOGGING_FORMAT, ACK_FAILURE );
super.handleAckFailureMessage();
}

@Override
public void handleSuccessMessage( Map<String,Value> meta )
{
super.handleSuccessMessage( meta );
logger.debug( "S: [SUCCESS %s]", meta );
super.handleSuccessMessage( meta );
}

@Override
public void handleRecordMessage( Value[] fields )
{
super.handleRecordMessage( fields );
logger.debug( "S: [RECORD %s]", Arrays.asList( fields ) );
super.handleRecordMessage( fields );
}

@Override
public void handleFailureMessage( String code, String message )
{
super.handleFailureMessage( code, message );
logger.debug("S: [FAILURE %s \"%s\"]", code, message );
super.handleFailureMessage( code, message );
}

@Override
public void handleIgnoredMessage()
{
super.handleIgnoredMessage();
logger.debug( DEFAULT_DEBUG_LOGGING_FORMAT, IGNORED );
super.handleIgnoredMessage();
}
}
37 changes: 34 additions & 3 deletions .../src/test/java/org/neo4j/driver/internal/connector/socket/LoggingResponseHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,12 @@
*/
package org.neo4j.driver.internal.connector.socket;

import org.junit.Rule;
import org.junit.Test;

import java.util.HashMap;

import org.junit.rules.ExpectedException;
import org.neo4j.driver.internal.logging.DevNullLogger;
import org.neo4j.driver.internal.messaging.DiscardAllMessage;
import org.neo4j.driver.internal.messaging.FailureMessage;
Expand All @@ -34,25 +36,33 @@
import org.neo4j.driver.internal.messaging.RunMessage;
import org.neo4j.driver.internal.messaging.SuccessMessage;
import org.neo4j.driver.internal.spi.StreamCollector;
import org.neo4j.driver.v1.Logger;
import org.neo4j.driver.v1.Value;

import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.neo4j.driver.v1.Values.parameters;
import static org.neo4j.driver.v1.Values.ofValue;

public class LoggingResponseHandlerTest
{

private String log;

private LoggingResponseHandler handler = new LoggingResponseHandler( new DevNullLogger()
private Logger debugLogger = new DevNullLogger()
{
@Override
public void debug( String message, Object... params )
{
log = String.format( message, params );
}
} );
};

@Rule
public ExpectedException exception = ExpectedException.none();

private LoggingResponseHandler handler = new LoggingResponseHandler( debugLogger );

@Test
public void shouldLogInitMessage() throws Throwable
Expand Down Expand Up @@ -159,6 +169,27 @@ public void shouldLogIgnoredMessage() throws Throwable
assertEquals( format( new IgnoredMessage() ), log );
}

@Test
public void shouldLogMessageWhenHandleMessageThrowsError() throws Throwable
{
// Given
SocketResponseHandler handler = new LoggingResponseHandler( debugLogger )
{
@Override
public void handleIgnoredMessage() {
throw new RuntimeException( "This will not stop logging" );
}
};

// When
exception.expect( RuntimeException.class );
exception.expectMessage( "This will not stop logging" );
handler.handleIgnoredMessage();

// Then
assertEquals( "S: [IGNORED]", log );
}


private String format( Message message )
{
Expand Down