added log splitting support.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@4444 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
kohsuke committed 2007-08-27 03:41:38 +00:00
1 parent 13936fcb81
commit 595d235b43
3 files changed
+120 -10

No files matched your search

@@ -23,7 +23,11 @@ import org.apache.maven.project.MavenProject;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.FileNotFoundException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
@@ -232,10 +236,19 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
}
class ProxyImpl2 extends ProxyImpl implements MavenBuildProxy2 {
private final SplittableBuildListener listener;
long startTime;
private final OutputStream log;
ProxyImpl2(SplittableBuildListener listener) throws FileNotFoundException {
this.listener = listener;
log = new BufferedOutputStream(new FileOutputStream(getLogFile()));
}
public void start() {
onStartBuilding();
startTime = System.currentTimeMillis();
listener.setSideOutputStream(log);
}
public void end() {
@@ -244,6 +257,7 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
onEndBuilding();
duration = System.currentTimeMillis()- startTime;
try {
listener.setSideOutputStream(null);
save();
} catch (IOException e) {
e.printStackTrace();
@@ -278,14 +278,15 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
logger.println("Triggering "+project.getRootModule().getModuleName());
project.getRootModule().scheduleBuild();
} else {
SplittableBuildListener slistener = new SplittableBuildListener(listener);
Map<ModuleName,MavenBuild.ProxyImpl2> proxies = new HashMap<ModuleName,MavenBuild.ProxyImpl2>();
for (MavenModule m : modules.values())
proxies.put(m.getModuleName(),m.newBuild().new ProxyImpl2());
proxies.put(m.getModuleName(),m.newBuild().new ProxyImpl2(slistener));
// run the complete build here
Map<String,String> envVars = getEnvVars();
ProcessCache.MavenProcess process = MavenBuild.mavenProcessCache.get(launcher.getChannel(), listener,
ProcessCache.MavenProcess process = MavenBuild.mavenProcessCache.get(launcher.getChannel(), slistener,
new MavenProcessFactory(project,launcher,envVars));
ArgumentListBuilder margs = new ArgumentListBuilder();
@@ -294,7 +295,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
try {
return process.channel.call(new Builder(
listener,proxies,modules.values(),margs.toList(),envVars));
slistener,proxies,modules.values(),margs.toList(),envVars));
} finally {
for (ProxyImpl2 p : proxies.values())
p.abortIfNotStarted();
@@ -330,15 +331,15 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
* Runs Maven and builds the project.
*/
private static final class Builder extends MavenBuilder {
private final Map<ModuleName,? extends MavenBuildProxy2> buildProxy;
private final Map<ModuleName,? extends MavenBuildProxy2> proxies;
private final Map<ModuleName,List<MavenReporter>> reporters = new HashMap<ModuleName,List<MavenReporter>>();
private final Map<ModuleName,List<ExecutedMojo>> executedMojos = new HashMap<ModuleName,List<ExecutedMojo>>();
private long mojoStartTime;
public Builder(BuildListener listener,Map<ModuleName,? extends MavenBuildProxy2> buildProxy, Collection<MavenModule> modules, List<String> goals, Map<String,String> systemProps) {
public Builder(BuildListener listener,Map<ModuleName,? extends MavenBuildProxy2> proxies, Collection<MavenModule> modules, List<String> goals, Map<String,String> systemProps) {
super(listener,goals,systemProps);
this.buildProxy = buildProxy;
this.proxies = proxies;
for (MavenModule m : modules)
reporters.put(m.getModuleName(),m.createReporters());
@@ -354,7 +355,8 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
void preModule(MavenProject project) throws InterruptedException, IOException, hudson.maven.agent.AbortException {
ModuleName name = new ModuleName(project);
MavenBuildProxy2 proxy = buildProxy.get(name);
MavenBuildProxy2 proxy = proxies.get(name);
listener.getLogger().flush(); // make sure the data until here are all written
proxy.start();
for (MavenReporter r : reporters.get(name))
if(!r.preBuild(proxy,project,listener))
@@ -363,17 +365,18 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
void postModule(MavenProject project) throws InterruptedException, IOException, hudson.maven.agent.AbortException {
ModuleName name = new ModuleName(project);
MavenBuildProxy2 proxy = buildProxy.get(name);
MavenBuildProxy2 proxy = proxies.get(name);
for (MavenReporter r : reporters.get(name))
if(!r.postBuild(proxy,project,listener))
throw new hudson.maven.agent.AbortException(r+" failed");
proxy.setExecutedMojos(executedMojos.get(name));
listener.getLogger().flush(); // make sure the data until here are all written
proxy.end();
}
void preExecute(MavenProject project, MojoInfo mojoInfo) throws IOException, InterruptedException, hudson.maven.agent.AbortException {
ModuleName name = new ModuleName(project);
MavenBuildProxy proxy = buildProxy.get(name);
MavenBuildProxy proxy = proxies.get(name);
for (MavenReporter r : reporters.get(name))
if(!r.preExecute(proxy,project,mojoInfo,listener))
throw new hudson.maven.agent.AbortException(r+" failed");
@@ -389,7 +392,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
executedMojos.put(name,mojoList=new ArrayList<ExecutedMojo>());
mojoList.add(new ExecutedMojo(mojoInfo,System.currentTimeMillis()-mojoStartTime));
MavenBuildProxy2 proxy = buildProxy.get(name);
MavenBuildProxy2 proxy = proxies.get(name);
for (MavenReporter r : reporters.get(name))
if(!r.postExecute(proxy,project,mojoInfo,listener,exception))
throw new hudson.maven.agent.AbortException(r+" failed");
@@ -0,0 +1,93 @@
package hudson.maven;
import hudson.model.BuildListener;
import hudson.model.Result;
import hudson.model.StreamBuildListener;
import hudson.util.NullStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.Serializable;
/**
* Delegating {@link BuildListener} that can have "side" {@link OutputStream}
* that gets log outputs. The side stream can be changed at runtime.
*
* @author Kohsuke Kawaguchi
* @since 1.133
*/
final class SplittableBuildListener implements BuildListener, Serializable {
/**
* The actual {@link BuildListener} where the output goes.
*/
private final BuildListener core;
private OutputStream side = new NullStream();
/**
* Constant {@link PrintStream} connected to both {@link #core} and {@link #side}.
* This is so that we can change the side stream without the client noticing it.
*/
private final PrintStream logger;
public SplittableBuildListener(BuildListener core) {
this.core = core;
final OutputStream base = core.getLogger();
logger = new PrintStream(new OutputStream() {
public void write(int b) throws IOException {
base.write(b);
side.write(b);
}
public void write(byte b[], int off, int len) throws IOException {
base.write(b,off,len);
side.write(b,off,len);
}
public void flush() throws IOException {
base.flush();
side.flush();
}
public void close() throws IOException {
base.close();
side.close();
}
});
}
public void setSideOutputStream(OutputStream os) {
if(os==null) os = new NullStream();
this.side = os;
}
public void started() {
core.started();
}
public void finished(Result result) {
core.finished(result);
}
public PrintStream getLogger() {
return logger;
}
public PrintWriter error(String msg) {
core.error(msg);
return new PrintWriter(logger);
}
public PrintWriter fatalError(String msg) {
core.fatalError(msg);
return new PrintWriter(logger);
}
private Object writeReplace() {
return new StreamBuildListener(logger);
}
private static final long serialVersionUID = 1L;
}