Merge pull request #449 from basil/nonFatalJnlpAgentEndpointResolutio…

…nExceptions Allow JNLP agent endpoint resolution exceptions to be non-fatal for Swarm
jenkinsci · May 7, 2021 · d4fe474 · d4fe474
2 parents 6508cf8 + 0f75589
commit d4fe474
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/hudson/remoting/Engine.java b/src/main/java/hudson/remoting/Engine.java
@@ -690,7 +690,11 @@ private void innerRun(IOHub hub, SSLContext context, ExecutorService service) {
                 try {
                     endpoint = resolver.resolve();
                 } catch (Exception e) {
-                    events.error(e);
+                    if (Boolean.getBoolean(Engine.class.getName() + ".nonFatalJnlpAgentEndpointResolutionExceptions")) {
+                        events.status("Could not resolve JNLP agent endpoint", e);
+                    } else {
+                        events.error(e);
+                    }
                     return;
                 }
                 if (endpoint == null) {