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: 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);