Skip to content

Commit b101f46

Browse files
committed
Temporarily restore support for gRPC.port for backwards compatibility
1 parent 8668518 commit b101f46

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

grpc-client-spring-boot-autoconfigure/src/main/java/net/devh/boot/grpc/client/nameresolver/DiscoveryClientNameResolver.java

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@
5252
@Slf4j
5353
public class DiscoveryClientNameResolver extends NameResolver {
5454

55+
@Deprecated
56+
private static final String LEGACY_CLOUD_DISCOVERY_METADATA_PORT = "gRPC.port";
5557
private static final List<ServiceInstance> KEEP_PREVIOUS = null;
5658

5759
private final String name;
@@ -243,9 +245,16 @@ private int getGRPCPort(final ServiceInstance instance) {
243245
if (metadata == null) {
244246
return instance.getPort();
245247
}
246-
final String portString = metadata.get(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT);
248+
String portString = metadata.get(GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT);
247249
if (portString == null) {
248-
return instance.getPort();
250+
portString = metadata.get(LEGACY_CLOUD_DISCOVERY_METADATA_PORT);
251+
if (portString == null) {
252+
return instance.getPort();
253+
} else {
254+
log.warn("Found legacy grpc port metadata '{}' for client '{}' use '{}' instead",
255+
LEGACY_CLOUD_DISCOVERY_METADATA_PORT, DiscoveryClientNameResolver.this.name,
256+
GrpcUtils.CLOUD_DISCOVERY_METADATA_PORT);
257+
}
249258
}
250259
try {
251260
return Integer.parseInt(portString);

0 commit comments

Comments
 (0)