Merge error and trace output in StillnessToll

arkanovicz · Jul 13, 2018 · d8af67c · d8af67c
1 parent 50c249c
commit d8af67c
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/src/main/java/com/republicate/stillness/StillnessTool.java b/src/main/java/com/republicate/stillness/StillnessTool.java
@@ -14,7 +14,7 @@ public class StillnessTool {
 
     protected static Logger logger = LoggerFactory.getLogger("stillness");
 
-    public static final String STILLNESS_CONFIG_FILE_KEY = "stillness.config";
+    public static final String STILLNESS_CONFIG_FILE_KEY = "org.republicate.stillness.config";
 
     String _configFile = null;
 
@@ -72,15 +72,24 @@ public void scrape(String source,String template) {
     }
 
     public String debug(String source,String template) {
-        Writer dbg = new StringWriter();
+        String ret = null;
+        PrintWriter trace = new PrintWriter(new StringWriter());
+        PrintWriter error = new PrintWriter(new StringWriter());
+        Exception ex = null;;
         try {
-            PrintWriter writer = new PrintWriter(dbg);
-            _stillness.setDebugOutput(writer);
+            _stillness.setDebugOutput(trace);
             _stillness.scrape(source,template,(Context)_context);
         } catch (Exception e) {
             logger.error("exception", e);
+            ex = e;
         } finally {
-            return dbg.toString();
+            if (ex != null) {
+                error.println("<pre>");
+                ex.printStackTrace(error);
+                error.println("</pre>");
+            }
+            ret = error.toString() + trace.toString();
         }
+        return ret;
     }
 }