You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/10/27 07:23:10 UTC
[dubbo] branch 3.0 updated: simplify formatted output of
MetadataInfo (#9141)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new 1a1402a simplify formatted output of MetadataInfo (#9141)
1a1402a is described below
commit 1a1402a960c8dd5b7fe12738ccb088637284ee2c
Author: ken.lj <ke...@gmail.com>
AuthorDate: Wed Oct 27 15:22:57 2021 +0800
simplify formatted output of MetadataInfo (#9141)
---
.../org/apache/dubbo/metadata/MetadataInfo.java | 24 ++++++++++++++++++++--
.../listener/ServiceInstancesChangedListener.java | 3 ++-
2 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
index b445d15..4f0cecb 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/MetadataInfo.java
@@ -203,7 +203,7 @@ public class MetadataInfo implements Serializable {
if (serviceInfo == null) {
return null;
}
- return serviceInfo.toString();
+ return serviceInfo.toFullString();
}
@Override
@@ -233,10 +233,27 @@ public class MetadataInfo implements Serializable {
return "metadata{" +
"app='" + app + "'," +
"revision='" + revision + "'," +
+ "size=" + (services == null ? 0 : services.size()) + "," +
+ "services=" + getSimplifiedServices(services) +
+ "}";
+ }
+
+ public String toFullString() {
+ return "metadata{" +
+ "app='" + app + "'," +
+ "revision='" + revision + "'," +
"services=" + services +
"}";
}
+ private String getSimplifiedServices(Map<String, ServiceInfo> services) {
+ if (services == null) {
+ return "[]";
+ }
+
+ return services.keySet().toString();
+ }
+
public static class ServiceInfo implements Serializable {
private String name;
private String group;
@@ -518,13 +535,16 @@ public class MetadataInfo implements Serializable {
@Override
public String toString() {
+ return getMatchKey();
+ }
+
+ public String toFullString() {
return "service{" +
"name='" + name + "'," +
"group='" + group + "'," +
"version='" + version + "'," +
"protocol='" + protocol + "'," +
"params=" + params + "," +
- "consumerParams=" + consumerParams +
"}";
}
}
diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
index 67994a4..faf8578 100644
--- a/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
+++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/client/event/listener/ServiceInstancesChangedListener.java
@@ -317,7 +317,8 @@ public class ServiceInstancesChangedListener {
if (metadata != null && metadata != MetadataInfo.EMPTY) {
// metadata loaded from cache
if (logger.isDebugEnabled()) {
- logger.debug("MetadataInfo for instance " + instance.getAddress() + "?revision=" + revision + "&cluster=" + instance.getRegistryCluster() + ", " + metadata);
+ logger.debug("MetadataInfo for instance " + instance.getAddress() + "?revision=" + revision
+ + "&cluster=" + instance.getRegistryCluster() + ", " + metadata);
}
parseMetadata(revision, metadata, localServiceToRevisions);
return metadata;