0001218: bind a logger as the "log" variable to the beanshell router,…

… column transform and load filter to make debugging easier
JumpMind · May 15, 2013 · 028838d · 028838d
1 parent 91f14ee
commit 028838d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/load/BshDatabaseWriterFilter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/load/BshDatabaseWriterFilter.java
@@ -56,6 +56,7 @@ public class BshDatabaseWriterFilter implements IDatabaseWriterFilter, IDatabase
     private static final String DATA = "data";
     private static final String ERROR = "error";
     private static final String ENGINE = "engine";
+    private static final String LOG = "log";
     private final String INTERPRETER_KEY = String.format("%d.BshInterpreter", hashCode());
     private final String BATCH_COMPLETE_SCRIPTS_KEY = String.format("%d.BatchCompleteScripts",
             hashCode());
@@ -125,6 +126,7 @@ protected Interpreter getInterpreter(Context context) {
     protected void bind(Interpreter interpreter, DataContext context, Table table, CsvData data, Exception error)
             throws EvalError {
 
+        interpreter.set(LOG, log);
         interpreter.set(ENGINE, this.symmetricEngine);
         interpreter.set(CONTEXT, context);
         interpreter.set(TABLE, table);

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/route/BshDataRouter.java
@@ -106,6 +106,7 @@ protected Set<String> eval(Object value, Set<Node> nodes, Set<String> targetNode
 
     protected void bind(Interpreter interpreter, DataMetaData dataMetaData, Set<Node> nodes, Set<String> targetNodes)
             throws EvalError {
+        interpreter.set("log", log);
         interpreter.set("dataMetaData", dataMetaData);
         interpreter.set("nodes", nodes);
         interpreter.set("identityNodeId", engine.getNodeService().findIdentityNodeId());

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java
@@ -60,6 +60,7 @@ public String transform(IDatabasePlatform platform,
             String newValue, String oldValue) throws IgnoreColumnException, IgnoreRowException {
         try {
             Interpreter interpreter = getInterpreter(context);
+            interpreter.set("log", log);
             interpreter.set("sqlTemplate", platform.getSqlTemplate());
             interpreter.set("currentValue", newValue);
             interpreter.set("oldValue", oldValue);