X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Futils%2FTraceHandler.java;h=0a09712d5218013992493838c75ad9aa0ad92527;hp=daa3743f387832d446f91cea0ba119747f1167aa;hb=54e2bea8f5fa5607a6b8932bd10c60399f7f2d4e;hpb=8537d55a7dacf9f528ea9453b03d2391ea348846

diff --git a/src/be/nikiroo/utils/TraceHandler.java b/src/be/nikiroo/utils/TraceHandler.java
index daa3743..0a09712 100644
--- a/src/be/nikiroo/utils/TraceHandler.java
+++ b/src/be/nikiroo/utils/TraceHandler.java
@@ -10,6 +10,7 @@ public class TraceHandler {
 	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,7 +28,7 @@ public class TraceHandler {
 	 * @param showErrorDetails
 	 *            show more details when printing errors
 	 * @param showTraces
-	 *            show level 1 traces on stdout, or no traces at all
+	 *            show level 1 traces on stderr, or no traces at all
 	 */
 	public TraceHandler(boolean showErrors, boolean showErrorDetails,
 			boolean showTraces) {
@@ -47,9 +48,29 @@ public class TraceHandler {
 	 */
 	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.traceLevel = Math.max(traceLevel, 0);
+		this.maxPrintSize = maxPrintSize;
 	}
 
 	/**
@@ -70,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());
 			}
 		}
 	}
@@ -85,15 +108,16 @@ 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.
 	 * <p>
-	 * By default, will only be effective if {@link TraceHandler#showTraces} is
-	 * true
+	 * By default, will only be effective if {@link TraceHandler#traceLevel} is
+	 * not 0.
 	 * <p>
 	 * A call to this method is equivalent to a call to
 	 * {@link TraceHandler#trace(String, int)} with a level of 1.
@@ -108,8 +132,8 @@ public class TraceHandler {
 	/**
 	 * A trace happened, show it.
 	 * <p>
-	 * By default, will only be effective if {@link TraceHandler#showTraces} is
-	 * true and the level is lower or equal to {@link TraceHandler#traceLevel}.
+	 * 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
@@ -118,7 +142,15 @@ public class TraceHandler {
 	 */
 	public void trace(String message, int level) {
 		if (traceLevel > 0 && level <= traceLevel) {
-			System.out.println(message);
+			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);
+			}
 		}
 	}
 }