From d8ace59fc6139c8525cfcd848e0a917e2ae3a8b3 Mon Sep 17 00:00:00 2001 From: Daniel Beck Date: Tue, 18 May 2021 19:16:51 +0200 Subject: [PATCH] Reference new tcp-agent-listener endpoint --- src/main/java/hudson/remoting/Engine.java | 4 ++-- src/main/java/org/jenkinsci/remoting/RoleSensitive.java | 2 ++ .../jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/hudson/remoting/Engine.java b/src/main/java/hudson/remoting/Engine.java index 0e9f4a641..95335666d 100644 --- a/src/main/java/hudson/remoting/Engine.java +++ b/src/main/java/hudson/remoting/Engine.java @@ -151,7 +151,7 @@ public Thread newThread(@Nonnull final Runnable r) { * *

* This value is determined from {@link #candidateUrls} after a successful connection. - * Note that this URL DOES NOT have "tcpSlaveAgentListener" in it. + * Note that this URL DOES NOT have "tcp-agent-listener" in it. */ @CheckForNull private URL hudsonUrl; @@ -639,7 +639,7 @@ public void closeRead() throws IOException { } events.onDisconnect(); while (true) { - // Unlike JnlpAgentEndpointResolver, we do not use $jenkins/tcpSlaveAgentListener/, as that will be a 404 if the TCP port is disabled. + // Unlike JnlpAgentEndpointResolver, we do not use $jenkins/tcp-agent-listener/, as that will be a 404 if the TCP port is disabled. URL ping = new URL(candidateUrls.get(0), "login"); try { HttpURLConnection conn = (HttpURLConnection) ping.openConnection(); diff --git a/src/main/java/org/jenkinsci/remoting/RoleSensitive.java b/src/main/java/org/jenkinsci/remoting/RoleSensitive.java index 63abe9425..b68f36800 100644 --- a/src/main/java/org/jenkinsci/remoting/RoleSensitive.java +++ b/src/main/java/org/jenkinsci/remoting/RoleSensitive.java @@ -38,5 +38,7 @@ public interface RoleSensitive { * receive {@link AbstractMethodError}, and treat that as if the invocation of * {@code checker.check(this,Role.UNKNOWN)} has happened. */ + // TODO Update Javadoc once https://github.com/jenkinsci/jenkins/pull/5494 is updated + // TODO Update Javadoc once developer documentation is migrated to jenkins.io/doc/developer void checkRoles(RoleChecker checker) throws SecurityException; } diff --git a/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java b/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java index 511cf5e64..6ff214d32 100644 --- a/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java +++ b/src/main/java/org/jenkinsci/remoting/engine/JnlpAgentEndpointResolver.java @@ -377,8 +377,8 @@ private boolean isPortVisible(String hostname, int port) { @Nonnull private URL toAgentListenerURL(@Nonnull String jenkinsUrl) throws MalformedURLException { return jenkinsUrl.endsWith("/") - ? new URL(jenkinsUrl + "tcpSlaveAgentListener/") - : new URL(jenkinsUrl + "/tcpSlaveAgentListener/"); + ? new URL(jenkinsUrl + "tcp-agent-listener/") + : new URL(jenkinsUrl + "/tcp-agent-listener/"); } @Override