mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
The term used in Hudson for this is 'launch', not 'start', so making it consistent.
git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@9386 71c3de6d-444a-0410-be80-ed276b4c234a
This commit is contained in:
1 parent
acfb32adaa
commit
d5752b8a41
5 files changed
+12
-10
No files matched your search
@@ -125,7 +125,7 @@ public abstract class Computer extends AbstractModelObject {
|
||||
|
||||
/**
|
||||
* Returns true if this computer is supposed to be launched via JNLP.
|
||||
* @deprecated see {@linkplain #isStartSupported()} and {@linkplain hudson.model.SlaveStartMethod}
|
||||
* @deprecated see {@linkplain #isLaunchSupported()} and {@linkplain hudson.model.SlaveStartMethod}
|
||||
*/
|
||||
@Exported
|
||||
@Deprecated
|
||||
@@ -137,7 +137,7 @@ public abstract class Computer extends AbstractModelObject {
|
||||
* Returns true if this computer can be launched by Hudson.
|
||||
*/
|
||||
@Exported
|
||||
public boolean isStartSupported() {
|
||||
public boolean isLaunchSupported() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,6 @@ import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.StaplerResponse;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.io.IOException;
|
||||
import org.kohsuke.stapler.export.ExportedBean;
|
||||
@@ -43,7 +42,7 @@ public final class ComputerSet implements ModelObject {
|
||||
|
||||
public void do_launchAll(StaplerRequest req, StaplerResponse rsp) throws IOException {
|
||||
for(Computer c : get_all()) {
|
||||
if(c.isStartSupported())
|
||||
if(c.isLaunchSupported())
|
||||
continue;
|
||||
c.launch();
|
||||
}
|
||||
|
||||
@@ -322,8 +322,8 @@ public final class Slave implements Node, Serializable {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isStartSupported() {
|
||||
return getNode().getStartMethod().isStartSupported();
|
||||
public boolean isLaunchSupported() {
|
||||
return getNode().getStartMethod().isLaunchSupported();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -587,7 +587,7 @@ public final class Slave implements Node, Serializable {
|
||||
public static class JNLPStartMethod extends SlaveStartMethod {
|
||||
|
||||
@Override
|
||||
public boolean isStartSupported() {
|
||||
public boolean isLaunchSupported() {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@ public abstract class SlaveAvailabilityStrategy implements Describable<SlaveAvai
|
||||
*/
|
||||
public long check(Slave slave, State state) {
|
||||
Slave.ComputerImpl c = slave.getComputer();
|
||||
if (c != null && c.isOffline() && c.isStartSupported())
|
||||
if (c != null && c.isOffline() && c.isLaunchSupported())
|
||||
c.tryReconnect();
|
||||
return 5;
|
||||
}
|
||||
|
||||
@@ -19,8 +19,11 @@ import org.apache.commons.beanutils.Converter;
|
||||
* @since 24-Apr-2008 22:12:35
|
||||
*/
|
||||
public abstract class SlaveStartMethod implements Describable<SlaveStartMethod>, ExtensionPoint {
|
||||
|
||||
public boolean isStartSupported() {
|
||||
/**
|
||||
* Returns true if this {@link SlaveStartMethod} supports
|
||||
* programatic launch of the slave agent in the target {@link Computer}.
|
||||
*/
|
||||
public boolean isLaunchSupported() {
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user