mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-17 14:02:22 +00:00
Refactored the channel creation code for better reuse from plugins
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@16105 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
7a640d4764
commit
6dfddc8de2
2 files changed
+81
-30
No files matched your search
@@ -28,6 +28,7 @@ import hudson.Launcher;
|
||||
import hudson.Proc;
|
||||
import hudson.AbortException;
|
||||
import hudson.EnvVars;
|
||||
import hudson.slaves.Channels;
|
||||
import static hudson.Util.fixNull;
|
||||
import hudson.maven.agent.Main;
|
||||
import hudson.model.BuildListener;
|
||||
@@ -213,36 +214,8 @@ final class MavenProcessFactory implements ProcessCache.Factory {
|
||||
throw e;
|
||||
}
|
||||
|
||||
return new Channel("Channel to Maven "+ Arrays.toString(cmds),
|
||||
Computer.threadPoolForRemoting, new BufferedInputStream(con.in), new BufferedOutputStream(con.out)) {
|
||||
|
||||
/**
|
||||
* Kill the process when the channel is severed.
|
||||
*/
|
||||
protected synchronized void terminate(IOException e) {
|
||||
super.terminate(e);
|
||||
try {
|
||||
proc.kill();
|
||||
} catch (IOException x) {
|
||||
// we are already in the error recovery mode, so just record it and move on
|
||||
LOGGER.log(Level.INFO, "Failed to terminate the severed connection",x);
|
||||
} catch (InterruptedException x) {
|
||||
// process the interrupt later
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized void close() throws IOException {
|
||||
super.close();
|
||||
// wait for Maven to complete
|
||||
try {
|
||||
proc.join();
|
||||
} catch (InterruptedException e) {
|
||||
// process the interrupt later
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
};
|
||||
return Channels.forProcess("Channel to Maven "+ Arrays.toString(cmds),
|
||||
Computer.threadPoolForRemoting, new BufferedInputStream(con.in), new BufferedOutputStream(con.out),proc);
|
||||
|
||||
// return launcher.launchChannel(buildMavenCmdLine(listener).toCommandArray(),
|
||||
// out, workDir, envVars);
|
||||
|
||||
@@ -0,0 +1,78 @@
|
||||
/*
|
||||
* The MIT License
|
||||
*
|
||||
* Copyright (c) 2004-2009, Sun Microsystems, Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
package hudson.slaves;
|
||||
|
||||
import hudson.remoting.Channel;
|
||||
import hudson.Proc;
|
||||
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.logging.Level;
|
||||
import java.util.logging.Logger;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
* Various convenient subtype of {@link Channel}s.
|
||||
*
|
||||
* @author Kohsuke Kawaguchi
|
||||
*/
|
||||
public class Channels {
|
||||
/**
|
||||
* Creates a channel that wraps a remote process, so that when we shut down the connection
|
||||
* we kill the process.
|
||||
*/
|
||||
public static Channel forProcess(String name, ExecutorService execService, InputStream in, OutputStream out, final Proc proc) throws IOException {
|
||||
return new Channel(name, execService, in, out) {
|
||||
/**
|
||||
* Kill the process when the channel is severed.
|
||||
*/
|
||||
protected synchronized void terminate(IOException e) {
|
||||
super.terminate(e);
|
||||
try {
|
||||
proc.kill();
|
||||
} catch (IOException x) {
|
||||
// we are already in the error recovery mode, so just record it and move on
|
||||
LOGGER.log(Level.INFO, "Failed to terminate the severed connection",x);
|
||||
} catch (InterruptedException x) {
|
||||
// process the interrupt later
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
|
||||
public synchronized void close() throws IOException {
|
||||
super.close();
|
||||
// wait for Maven to complete
|
||||
try {
|
||||
proc.join();
|
||||
} catch (InterruptedException e) {
|
||||
// process the interrupt later
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
private static final Logger LOGGER = Logger.getLogger(Channels.class.getName());
|
||||
}
|
||||
Reference in new issue
Block a user