X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;ds=inline;f=src%2Fbe%2Fnikiroo%2Futils%2FTraceHandler.java;h=0a09712d5218013992493838c75ad9aa0ad92527;hb=a67248cf983a1370625887c82ed7524e95b56dd1;hp=d7f604667f8976c8afe595a81620b5665d4981aa;hpb=08a58812f12617289463b00161c98d7c59490bf2;p=fanfix.git diff --git a/src/be/nikiroo/utils/TraceHandler.java b/src/be/nikiroo/utils/TraceHandler.java index d7f6046..0a09712 100644 --- a/src/be/nikiroo/utils/TraceHandler.java +++ b/src/be/nikiroo/utils/TraceHandler.java @@ -7,9 +7,10 @@ package be.nikiroo.utils; * @author niki */ public class TraceHandler { - private boolean showErrors; - private boolean showTraces; - private boolean showErrorDetails; + private final boolean showErrors; + private final boolean showErrorDetails; + private final int traceLevel; + private final int maxPrintSize; /** * Create a default {@link TraceHandler} that will print errors on stderr @@ -27,13 +28,58 @@ public class TraceHandler { * @param showErrorDetails * show more details when printing errors * @param showTraces - * show traces on stdout + * show level 1 traces on stderr, or no traces at all */ public TraceHandler(boolean showErrors, boolean showErrorDetails, boolean showTraces) { + this(showErrors, showErrorDetails, showTraces ? 1 : 0); + } + + /** + * Create a default {@link TraceHandler}. + * + * @param showErrors + * show errors on stderr + * @param showErrorDetails + * show more details when printing errors + * @param traceLevel + * show traces of this level or lower (0 means "no traces", + * higher means more traces) + */ + public TraceHandler(boolean showErrors, boolean showErrorDetails, + int traceLevel) { + this(showErrors, showErrorDetails, traceLevel, -1); + } + + /** + * Create a default {@link TraceHandler}. + * + * @param showErrors + * show errors on stderr + * @param showErrorDetails + * show more details when printing errors + * @param traceLevel + * show traces of this level or lower (0 means "no traces", + * higher means more traces) + * @param maxPrintSize + * the maximum size at which to truncate traces data (or -1 for + * "no limit") + */ + public TraceHandler(boolean showErrors, boolean showErrorDetails, + int traceLevel, int maxPrintSize) { this.showErrors = showErrors; this.showErrorDetails = showErrorDetails; - this.showTraces = showTraces; + this.traceLevel = Math.max(traceLevel, 0); + this.maxPrintSize = maxPrintSize; + } + + /** + * The trace level of this {@link TraceHandler}. + * + * @return the level + */ + public int getTraceLevel() { + return traceLevel; } /** @@ -45,9 +91,11 @@ public class TraceHandler { public void error(Exception e) { if (showErrors) { if (showErrorDetails) { + long now = System.currentTimeMillis(); + System.err.print(StringUtils.fromTime(now) + ": "); e.printStackTrace(); } else { - error(e.getMessage()); + error(e.toString()); } } } @@ -60,21 +108,49 @@ public class TraceHandler { */ public void error(String message) { if (showErrors) { - System.err.println(message); + long now = System.currentTimeMillis(); + System.err.println(StringUtils.fromTime(now) + ": " + message); } } /** * A trace happened, show it. *
- * Will only be effective if {@link TraceHandler#isShowTraces()} is true. + * By default, will only be effective if {@link TraceHandler#traceLevel} is + * not 0. + *
+ * A call to this method is equivalent to a call to + * {@link TraceHandler#trace(String, int)} with a level of 1. * * @param message * the trace message */ public void trace(String message) { - if (showTraces) { - System.out.println(message); + trace(message, 1); + } + + /** + * A trace happened, show it. + *
+ * By default, will only be effective if {@link TraceHandler#traceLevel} is + * not 0 and the level is lower or equal to it. + * + * @param message + * the trace message + * @param level + * the trace level + */ + public void trace(String message, int level) { + if (traceLevel > 0 && level <= traceLevel) { + long now = System.currentTimeMillis(); + System.err.print(StringUtils.fromTime(now) + ": "); + if (maxPrintSize > 0 && message.length() > maxPrintSize) { + + System.err + .println(message.substring(0, maxPrintSize) + "[...]"); + } else { + System.err.println(message); + } } } }