Integrate Slc Execution notification in the new runtime

[gpl/argeo-slc.git] / org.argeo.slc.agent / src / main / java / org / argeo / slc / ant / SlcExecutionBuildListener.java

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
index f39b79baa4231f096607a5f57160f2872f4f8514..2b9400e4b0efb58fe3b7baff387ca68f70d91b6d 100644 (file)
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/ant/SlcExecutionBuildListener.java
@@ -4,55 +4,47 @@ import java.util.List;
 import java.util.Vector;\r
 \r
 import org.apache.log4j.AppenderSkeleton;\r
+import org.apache.log4j.Level;\r
 import org.apache.log4j.LogManager;\r
+import org.apache.log4j.MDC;\r
+import org.apache.log4j.Priority;\r
 import org.apache.log4j.spi.LoggingEvent;\r
 import org.apache.tools.ant.BuildEvent;\r
+import org.apache.tools.ant.BuildListener;\r
 import org.apache.tools.ant.Project;\r
+import org.argeo.slc.core.SlcException;\r
 import org.argeo.slc.core.process.SlcExecution;\r
 import org.argeo.slc.core.process.SlcExecutionNotifier;\r
 import org.argeo.slc.core.process.SlcExecutionStep;\r
 import org.argeo.slc.ws.process.WebServiceSlcExecutionNotifier;\r
 \r
 public class SlcExecutionBuildListener extends AppenderSkeleton implements\r
-               ProjectRelatedBuildListener {\r
-       private Project project;\r
-\r
-       // to avoid stack overflow when logging for log4j\r
-       private boolean isLogging = false;\r
-\r
+               BuildListener {\r
        private List<SlcExecutionNotifier> notifiers = new Vector<SlcExecutionNotifier>();\r
 \r
        private boolean currentStepNotified = true;\r
 \r
        // CUSTOMIZATIONS\r
+       /**\r
+        * Whether to log Ant initialization stuff before the first target has been\r
+        * called.\r
+        */\r
        private boolean logBeforeFirstTarget = false;\r
+       /** Whether the first target has been called. */\r
        private boolean firstTargetStarted = false;\r
 \r
        private boolean logTaskStartFinish = true;\r
 \r
-       public void init(Project project) {\r
-               if (this.project != null) {\r
-                       throw new SlcAntException("Build listener already initialized");\r
-               }\r
-\r
-               this.project = project;\r
-\r
-               if (!LogManager.getRootLogger().isAttached(this)) {\r
-                       LogManager.getRootLogger().addAppender(this);\r
-               }\r
-\r
-               SlcExecution slcExecution = (SlcExecution) project\r
-                               .getReference(SlcAntConstants.REF_SLC_EXECUTION);\r
-               if (slcExecution == null)\r
-                       throw new SlcAntException("No SLC Execution registered.");\r
+       public SlcExecutionBuildListener() {\r
+               // Default log level\r
+               setThreshold(Level.INFO);\r
+       }\r
 \r
+       public void buildStarted(BuildEvent event) {\r
+               SlcExecution slcExecution = getSlcExecution(event);\r
                for (SlcExecutionNotifier notifier : notifiers) {\r
                        notifier.newExecution(slcExecution);\r
                }\r
-\r
-       }\r
-\r
-       public void buildStarted(BuildEvent event) {\r
        }\r
 \r
        public void buildFinished(BuildEvent event) {\r
@@ -64,11 +56,6 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
                        notifier.updateStatus(slcExecution, oldStatus, slcExecution\r
                                        .getStatus());\r
                }\r
-\r
-//             AbstractApplicationContext context = (AbstractApplicationContext) getProject()\r
-//                             .getReference(SlcProjectHelper.REF_ROOT_CONTEXT);\r
-//             if (context != null)\r
-//                     context.close();\r
        }\r
 \r
        public void messageLogged(BuildEvent event) {\r
@@ -141,11 +128,10 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
        }\r
 \r
        protected SlcExecution getSlcExecution(BuildEvent event) {\r
-               Project projectEvt = event.getProject();\r
-               if (!projectEvt.equals(project))\r
-                       throw new SlcAntException("Event project " + projectEvt\r
-                                       + " not consistent with listener project " + project);\r
+               return getSlcExecution(event.getProject());\r
+       }\r
 \r
+       protected SlcExecution getSlcExecution(Project project) {\r
                SlcExecution slcExecution = (SlcExecution) project\r
                                .getReference(SlcAntConstants.REF_SLC_EXECUTION);\r
 \r
@@ -179,38 +165,18 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
 \r
        @Override\r
        protected void append(LoggingEvent event) {\r
-               if (isLogging) {\r
-                       // avoid StackOverflow if notification calls Log4j itself.\r
-                       return;\r
-               }\r
-               \r
-               // FIXME: make it more generic\r
-               if (event.getLoggerName().equals(\r
-                               WebServiceSlcExecutionNotifier.class.getName())) {\r
-                       return;\r
-               }\r
-\r
-               isLogging = true;\r
-\r
-               try {\r
-                       SlcExecution slcExecution = (SlcExecution) project\r
-                                       .getReference(SlcAntConstants.REF_SLC_EXECUTION);\r
-                       if (slcExecution != null) {\r
-                               if (currentStepNotified) {\r
-                                       slcExecution.getSteps().add(\r
-                                                       new SlcExecutionStep("LOG", event.getMessage()\r
-                                                                       .toString()));\r
-                                       currentStepNotified = false;\r
-                               }\r
-                               slcExecution.currentStep()\r
-                                               .addLog(event.getMessage().toString());\r
-                       } else {\r
-                               // TODO: log before initialization?\r
-                       }\r
-               } finally {\r
-                       isLogging = false;\r
+               Project project = (Project) MDC.get(SlcAntConstants.MDC_ANT_PROJECT);\r
+               if (project == null)\r
+                       throw new SlcException("No Ant project registered in Log4j MDC.");\r
+\r
+               SlcExecution slcExecution = getSlcExecution(project);\r
+               if (currentStepNotified) {\r
+                       slcExecution.getSteps().add(\r
+                                       new SlcExecutionStep("LOG", event.getMessage().toString()));\r
+                       currentStepNotified = false;\r
+               } else {\r
+                       slcExecution.currentStep().addLog(event.getMessage().toString());\r
                }\r
-\r
        }\r
 \r
        protected boolean shouldLog() {\r
@@ -226,8 +192,16 @@ public class SlcExecutionBuildListener extends AppenderSkeleton implements
                return false;\r
        }\r
 \r
-       public Project getProject() {\r
-               return project;\r
+       public void setLogBeforeFirstTarget(boolean logBeforeFirstTarget) {\r
+               this.logBeforeFirstTarget = logBeforeFirstTarget;\r
+       }\r
+\r
+       public void setLogTaskStartFinish(boolean logTaskStartFinish) {\r
+               this.logTaskStartFinish = logTaskStartFinish;\r
+       }\r
+\r
+       public void setLogLevel(String logLevel) {\r
+               setThreshold(Level.toLevel(logLevel));\r
        }\r
 \r
 }\r