Long step logs can slow down the UI. Fixed #469

JumpMind · Sep 13, 2016 · 0b600ec · 0b600ec
1 parent 5ae2c28
commit 0b600ec
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/metl-core/src/main/java/org/jumpmind/metl/core/model/Component.java b/metl-core/src/main/java/org/jumpmind/metl/core/model/Component.java
@@ -26,6 +26,7 @@
 
 import org.jumpmind.db.sql.Row;
 import org.jumpmind.metl.core.runtime.EntityData;
+import org.jumpmind.metl.core.util.LogUtils;
 
 public class Component extends AbstractObjectWithSettings {
 
@@ -290,7 +291,7 @@ public Row toRow(EntityData data, boolean qualifyWithEntityName, boolean input)
 
             @Override
             public String toString() {
-                return String.format("{{ChangeType=%s},\n %s}", data.getChangeType(), super.toString().replace(",", ",\n"));
+                return LogUtils.toJson(data.getChangeType().name(), this);
             }
         };
         Model model = input ? inputModel : outputModel;

diff --git a/metl-core/src/main/java/org/jumpmind/metl/core/model/Model.java b/metl-core/src/main/java/org/jumpmind/metl/core/model/Model.java
@@ -27,6 +27,7 @@
 
 import org.jumpmind.db.sql.Row;
 import org.jumpmind.metl.core.runtime.EntityData;
+import org.jumpmind.metl.core.util.LogUtils;
 
 public class Model extends AbstractObject {
 
@@ -197,7 +198,7 @@ public Row toRow(EntityData data, boolean qualifyWithEntityName) {
 
             @Override
             public String toString() {
-                return String.format("{{ChangeType=%s},\n %s}", data.getChangeType(), super.toString().replace(",", ",\n"));
+                return LogUtils.toJson(data.getChangeType().name(), this);
             }
         };
         Set<String> attributeIds = data.keySet();

diff --git a/metl-core/src/main/java/org/jumpmind/metl/core/util/LogUtils.java b/metl-core/src/main/java/org/jumpmind/metl/core/util/LogUtils.java
@@ -24,9 +24,12 @@
 import static org.apache.commons.lang.StringUtils.isNotBlank;
 
 import java.io.File;
+import java.util.Iterator;
+import java.util.Map.Entry;
 
 import org.apache.log4j.PatternLayout;
 import org.apache.log4j.RollingFileAppender;
+import org.jumpmind.db.sql.Row;
 import org.slf4j.bridge.SLF4JBridgeHandler;
 import org.springframework.context.ApplicationContext;
 
@@ -63,6 +66,33 @@ public static File getLogDir() {
         return logDir;
     }
 
+    public static String toJson(String changeType, Row row) {
+        Iterator<Entry<String, Object>> i = row.entrySet().iterator();
+        if (!i.hasNext()) {
+            return "{}";
+        }
+
+        StringBuilder sb = new StringBuilder();
+        sb.append('{');
+        sb.append("\"ChangeType\" : \"").append(changeType).append('"').append('\n');
+        for (;;) {
+            Entry<String, Object> e = i.next();
+            String key = e.getKey();
+            Object value = e.getValue();
+            sb.append('"').append(key).append('"');
+            sb.append(" : ");
+            if (value instanceof String) {
+                sb.append('"').append(value).append('"');
+            } else {
+                sb.append(value);
+            }
+            if (!i.hasNext()) {
+                return sb.append('}').toString();
+            }
+            sb.append(',').append(' ').append('\n');
+        }
+    }
+
     public static String formatDuration(long timeInMs) {
         if (timeInMs > 60000) {
             long minutes = timeInMs / 60000;