Skip to content

Commit 1b4bb80

Browse files
committed
Update console formatter to include exception in the formatting (neo4j#942)
1 parent b09866e commit 1b4bb80

File tree

1 file changed

+20
-2
lines changed

1 file changed

+20
-2
lines changed

driver/src/main/java/org/neo4j/driver/internal/logging/ConsoleLogging.java

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
*/
1919
package org.neo4j.driver.internal.logging;
2020

21+
import java.io.PrintWriter;
22+
import java.io.StringWriter;
2123
import java.time.LocalDateTime;
2224
import java.util.Objects;
2325
import java.util.logging.ConsoleHandler;
@@ -70,14 +72,14 @@ public ConsoleLogger( String name, Level level )
7072
}
7173

7274
handler = new ConsoleHandler();
73-
handler.setFormatter( new ShortFormatter() );
75+
handler.setFormatter( new ConsoleFormatter() );
7476
handler.setLevel( level );
7577
logger.addHandler( handler );
7678
logger.setLevel( level );
7779
}
7880
}
7981

80-
private static class ShortFormatter extends Formatter
82+
private static class ConsoleFormatter extends Formatter
8183
{
8284
@Override
8385
public String format( LogRecord record )
@@ -86,7 +88,23 @@ public String format( LogRecord record )
8688
record.getLevel() + " " +
8789
record.getLoggerName() + " - " +
8890
formatMessage( record ) +
91+
formatThrowable( record.getThrown() ) +
8992
"\n";
9093
}
94+
95+
private String formatThrowable( Throwable throwable )
96+
{
97+
String throwableString = "";
98+
if ( throwable != null )
99+
{
100+
StringWriter sw = new StringWriter();
101+
PrintWriter pw = new PrintWriter( sw );
102+
pw.println();
103+
throwable.printStackTrace( pw );
104+
pw.close();
105+
throwableString = sw.toString();
106+
}
107+
return throwableString;
108+
}
91109
}
92110
}

0 commit comments

Comments
 (0)