Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
*/
package org.neo4j.driver.internal.logging;

import java.io.PrintWriter;
import java.io.StringWriter;
import java.time.LocalDateTime;
import java.util.Objects;
import java.util.logging.ConsoleHandler;
Expand Down Expand Up @@ -70,14 +72,14 @@ public ConsoleLogger( String name, Level level )
}

handler = new ConsoleHandler();
handler.setFormatter( new ShortFormatter() );
handler.setFormatter( new ConsoleFormatter() );
handler.setLevel( level );
logger.addHandler( handler );
logger.setLevel( level );
}
}

private static class ShortFormatter extends Formatter
private static class ConsoleFormatter extends Formatter
{
@Override
public String format( LogRecord record )
Expand All @@ -86,7 +88,23 @@ public String format( LogRecord record )
record.getLevel() + " " +
record.getLoggerName() + " - " +
formatMessage( record ) +
formatThrowable( record.getThrown() ) +
"\n";
}

private String formatThrowable( Throwable throwable )
{
String throwableString = "";
if ( throwable != null )
{
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter( sw );
pw.println();
throwable.printStackTrace( pw );
pw.close();
throwableString = sw.toString();
}
return throwableString;
}
}
}