From 36ec485f5ef14ed8acae73c20e84a9b147530970 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 May 2026 09:28:44 -0400 Subject: [PATCH 1/2] Fix number of arguments in logging statement Fixes #978 --- .../consul/serviceregistry/ConsulServiceRegistry.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java index 0d5d40df3..68c12b49b 100644 --- a/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java +++ b/spring-cloud-consul-discovery/src/main/java/org/springframework/cloud/consul/serviceregistry/ConsulServiceRegistry.java @@ -100,16 +100,14 @@ public void setStatus(ConsulRegistration registration, String status) { if (status.equalsIgnoreCase(OUT_OF_SERVICE.getCode())) { ResponseEntity response = this.client.agentServiceSetMaintenance(registration.getInstanceId(), true, null, this.properties.getAclToken()); - log.debug(LogMessage.format( - "Set status for service with consul: %s, status %s, response %s" + registration.getInstanceId(), - status, response)); + log.debug(LogMessage.format("Set status for service with consul: %s, status %s, response %s", + registration.getInstanceId(), status, response)); } else if (status.equalsIgnoreCase(UP.getCode())) { ResponseEntity response = this.client.agentServiceSetMaintenance(registration.getInstanceId(), false, null, this.properties.getAclToken()); - log.debug(LogMessage.format( - "Set status for service with consul: %s, status %s, response %s" + registration.getInstanceId(), - status, response)); + log.debug(LogMessage.format("Set status for service with consul: %s, status %s, response %s", + registration.getInstanceId(), status, response)); } else { throw new IllegalArgumentException("Unknown status: " + status); From 7155a43a061300204ae64f883a731a1d4b33c454 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 4 May 2026 09:38:47 -0400 Subject: [PATCH 2/2] Build PRs on main --- .github/workflows/pr.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index d10e429d0..4c8df033f 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -2,7 +2,7 @@ name: PR on: pull_request: - branches: [ 4.3.x ] + branches: [ main, 4.3.x ] jobs: build: