diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2013-02-08 15:05:33 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2013-02-08 15:05:33 +0100 |
| commit | fa7f9d15e6b8efa1cf10456cd32865355f5337ca (patch) | |
| tree | 03abea940d40b792cd5c7fb0275b4c5cb7376284 | |
| parent | c0ae580819a5599e95454b4da4d96db6a8943b58 (diff) | |
Logging and exception cleanup
| -rw-r--r-- | src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/process/module/Module.java | 1 | ||||
| -rw-r--r-- | src/main/java/com/c2kernel/scripting/Script.java | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java index 157297f..4485ad0 100644 --- a/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java +++ b/src/main/java/com/c2kernel/entity/proxy/MemberSubscription.java @@ -64,7 +64,7 @@ public class MemberSubscription<C extends C2KLocalObject> implements Runnable { //report that we're done
observer.control(END, null);
} catch (Exception ex) {
- observer.control(ERROR, "Query on "+interest+" failed with "+ex);
+ observer.control(ERROR, "Query on "+interest+" failed with "+ex.getMessage());
}
}
diff --git a/src/main/java/com/c2kernel/process/module/Module.java b/src/main/java/com/c2kernel/process/module/Module.java index abcae2e..91c43b2 100644 --- a/src/main/java/com/c2kernel/process/module/Module.java +++ b/src/main/java/com/c2kernel/process/module/Module.java @@ -35,6 +35,7 @@ public class Module { public void runScript(String event, boolean isServer) throws ScriptingEngineException {
for (ModuleScript script : scripts) {
if (script.shouldRun(event, isServer)) {
+ Logger.msg("Running "+script.event+" "+script.target+" script from "+name);
Object result = script.getScript().execute();
if (result instanceof ErrorInfo) {
ErrorInfo error = (ErrorInfo) result;
diff --git a/src/main/java/com/c2kernel/scripting/Script.java b/src/main/java/com/c2kernel/scripting/Script.java index c517291..9c0169a 100644 --- a/src/main/java/com/c2kernel/scripting/Script.java +++ b/src/main/java/com/c2kernel/scripting/Script.java @@ -387,6 +387,8 @@ public class Script // execute the child scripts
for (Script importScript : mIncludes) {
+ if (Logger.doLog(8))
+ Logger.msg(8, "Import script:\n"+importScript.mScript);
importScript.execute();
}
@@ -395,10 +397,13 @@ public class Script try
{
Logger.msg(7, "Script.execute() - Executing script");
+ if (Logger.doLog(8))
+ Logger.msg(8, "Script:\n"+mScript);
+
if (engine == null)
throw new ScriptingEngineException("Script engine not set. Cannot execute scripts.");
returnValue = engine.eval(mScript, beans);
- Logger.msg(8, "Script.execute() - script returned \"" + returnValue + "\"");
+ Logger.msg(7, "Script.execute() - script returned \"" + returnValue + "\"");
}
catch (Exception ex)
{
|