X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2FProcessThreadGroup.java;h=2f264bed46ea59c441a4031e895cc1d70e3e5d3a;hb=d1298659fe6f179d1cbbc8c89f108a0bbc5b4edf;hp=f7e2bea1c810c500e625bf5aa672014f39e7e69b;hpb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java index f7e2bea1c..2f264bed4 100644 --- a/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java +++ b/runtime/org.argeo.slc.core/src/main/java/org/argeo/slc/core/execution/ProcessThreadGroup.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Mathieu Baudier + * Copyright (C) 2007-2012 Argeo GmbH * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,39 +13,62 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.argeo.slc.core.execution; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.util.concurrent.ArrayBlockingQueue; +import java.util.concurrent.BlockingQueue; -import org.argeo.slc.process.SlcExecution; -import org.argeo.slc.process.SlcExecutionNotifier; -import org.argeo.slc.process.SlcExecutionStep; +import org.argeo.slc.execution.ExecutionProcess; +import org.argeo.slc.execution.ExecutionStep; +import org.springframework.security.Authentication; +import org.springframework.security.context.SecurityContextHolder; +/** The thread group attached to a given {@link SlcExecution}. */ public class ProcessThreadGroup extends ThreadGroup { - private final ProcessThread processThread; + // private final ExecutionModulesManager executionModulesManager; + // private final ProcessThread processThread; + private final Authentication authentication; + private final static Integer STEPS_BUFFER_CAPACITY = 5000; + + private BlockingQueue steps = new ArrayBlockingQueue( + STEPS_BUFFER_CAPACITY); - public ProcessThreadGroup(ProcessThread processThread) { - super("SLC Process #" + processThread.getSlcProcess().getUuid() - + " thread group"); - this.processThread = processThread; + private Boolean hadAnError = false; + + public ProcessThreadGroup(ExecutionProcess executionProcess) { + super("SLC Process #" + executionProcess.getUuid() + " thread group"); + // this.executionModulesManager = executionModulesManager; + // this.processThread = processThread; + this.authentication = SecurityContextHolder.getContext() + .getAuthentication(); } - public SlcExecution getSlcProcess() { - return processThread.getSlcProcess(); + public Authentication getAuthentication() { + return authentication; } - public void dispatchAddStep(SlcExecutionStep step) { - processThread.getSlcProcess().getSteps().add(step); - List steps = new ArrayList(); - steps.add(step); - for (Iterator it = processThread - .getExecutionModulesManager().getSlcExecutionNotifiers() - .iterator(); it.hasNext();) { - it.next().addSteps(processThread.getSlcProcess(), steps); - } + public void dispatchAddStep(ExecutionStep step) { + // ExecutionProcess slcProcess = processThread.getProcess(); + // List steps = new ArrayList(); + // steps.add(step); + // TODO clarify why we don't dispatch steps, must be a reason + // dispatchAddSteps(steps); + // slcProcess.addSteps(steps); + if (step.getType().equals(ExecutionStep.ERROR)) + hadAnError = true; + this.steps.add(step); } + // public void dispatchAddSteps(List steps) { + // ExecutionProcess slcProcess = processThread.getProcess(); + // executionModulesManager.dispatchAddSteps(slcProcess, steps); + // } + + public BlockingQueue getSteps() { + return steps; + } + + public Boolean hadAnError() { + return hadAnError; + } }