diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java index 308e62bec2..f009835cc7 100644 --- a/core/src/main/java/jenkins/model/Jenkins.java +++ b/core/src/main/java/jenkins/model/Jenkins.java @@ -1230,15 +1230,17 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve return jenkins.model.Messages.EnforceSlaveAgentPortAdministrativeMonitor_displayName(); } + public String getSystemPropertyName() { + return Jenkins.class.getName() + ".slaveAgentPort"; + } + public int getExpectedPort() { int slaveAgentPort = j.slaveAgentPort; return Jenkins.getSlaveAgentPortInitialValue(slaveAgentPort); } public void doAct(StaplerRequest req, StaplerResponse rsp) throws IOException { - if (req.hasParameter("reset")) { - j.setSlaveAgentPort(getExpectedPort()); - } + j.setSlaveAgentPort(getExpectedPort()); rsp.sendRedirect2(req.getContextPath() + "/manage"); } diff --git a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly index 0f9f1b7478..bc2149f752 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.jelly @@ -24,7 +24,7 @@ THE SOFTWARE.
- ${%description(it.expectedPort)} + ${%description(it.systemPropertyName, it.expectedPort)}
diff --git a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties index 1494760e14..e4f6f0fd8c 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties +++ b/core/src/main/resources/jenkins/model/Jenkins/EnforceSlaveAgentPortAdministrativeMonitor/message.properties @@ -1,2 +1,2 @@ -description=Slave Agent Port has been manually changed. Its value will be reset to {0,number,#} on restart. +description=JNLP Agent Port has been changed but was specified through system property {0} on startup. Its value will be reset to {1,number,#} on restart. reset=Reset to {0,number,#}