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/09/20 14:04:07 UTC
[dubbo] branch 3.0 updated: Optimize some code of the dubbo
metadata module (#8783)
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 feb53c3 Optimize some code of the dubbo metadata module (#8783)
feb53c3 is described below
commit feb53c3f6b766f44cd3658866539720feff261cd
Author: Wang Chengming <63...@qq.com>
AuthorDate: Mon Sep 20 22:04:00 2021 +0800
Optimize some code of the dubbo metadata module (#8783)
* Optimize some code of the dubbo metadata module
* Optimize some code of the dubbo metadata module
---
.../metadata/report/support/AbstractMetadataReport.java | 15 ++++++++-------
.../apache/dubbo/metadata/report/support/Constants.java | 6 ++++++
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
index 4aa5e07..f23fc04 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/AbstractMetadataReport.java
@@ -65,13 +65,16 @@ import static org.apache.dubbo.common.constants.CommonConstants.CONSUMER_SIDE;
import static org.apache.dubbo.common.constants.CommonConstants.FILE_KEY;
import static org.apache.dubbo.common.constants.CommonConstants.PROVIDER_SIDE;
import static org.apache.dubbo.common.utils.StringUtils.replace;
+import static org.apache.dubbo.metadata.report.support.Constants.CACHE;
import static org.apache.dubbo.metadata.report.support.Constants.CYCLE_REPORT_KEY;
import static org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_CYCLE_REPORT;
import static org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_RETRY_PERIOD;
import static org.apache.dubbo.metadata.report.support.Constants.DEFAULT_METADATA_REPORT_RETRY_TIMES;
+import static org.apache.dubbo.metadata.report.support.Constants.DUBBO_METADATA;
import static org.apache.dubbo.metadata.report.support.Constants.RETRY_PERIOD_KEY;
import static org.apache.dubbo.metadata.report.support.Constants.RETRY_TIMES_KEY;
import static org.apache.dubbo.metadata.report.support.Constants.SYNC_REPORT_KEY;
+import static org.apache.dubbo.metadata.report.support.Constants.USER_HOME;
/**
*
@@ -102,11 +105,9 @@ public abstract class AbstractMetadataReport implements MetadataReport {
public AbstractMetadataReport(URL reportServerURL) {
setUrl(reportServerURL);
// Start file save timer
- String defaultFilename = System.getProperty("user.home") +
- "/.dubbo/dubbo-metadata-" +
- reportServerURL.getApplication() + "-" +
- replace(reportServerURL.getAddress(), ":", "-") +
- ".cache";
+ String defaultFilename = System.getProperty(USER_HOME) + DUBBO_METADATA +
+ reportServerURL.getApplication() + "-" +
+ replace(reportServerURL.getAddress(), ":", "-") + CACHE;
String filename = reportServerURL.getParameter(FILE_KEY, defaultFilename);
File file = null;
if (ConfigUtils.isNotEmpty(filename)) {
@@ -116,7 +117,7 @@ public abstract class AbstractMetadataReport implements MetadataReport {
throw new IllegalArgumentException("Invalid service store file " + file + ", cause: Failed to create directory " + file.getParentFile() + "!");
}
}
- // if this file exist, firstly delete it.
+ // if this file exists, firstly delete it.
if (!initialized.getAndSet(true) && file.exists()) {
file.delete();
}
@@ -125,7 +126,7 @@ public abstract class AbstractMetadataReport implements MetadataReport {
loadProperties();
syncReport = reportServerURL.getParameter(SYNC_REPORT_KEY, false);
metadataReportRetry = new MetadataReportRetry(reportServerURL.getParameter(RETRY_TIMES_KEY, DEFAULT_METADATA_REPORT_RETRY_TIMES),
- reportServerURL.getParameter(RETRY_PERIOD_KEY, DEFAULT_METADATA_REPORT_RETRY_PERIOD));
+ reportServerURL.getParameter(RETRY_PERIOD_KEY, DEFAULT_METADATA_REPORT_RETRY_PERIOD));
// cycle report the data switch
if (reportServerURL.getParameter(CYCLE_REPORT_KEY, DEFAULT_METADATA_REPORT_CYCLE_REPORT)) {
ScheduledExecutorService scheduler = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("DubboMetadataReportTimer", true));
diff --git a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
index 8cee825..531f6b4 100644
--- a/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
+++ b/dubbo-metadata/dubbo-metadata-api/src/main/java/org/apache/dubbo/metadata/report/support/Constants.java
@@ -33,4 +33,10 @@ public interface Constants {
String CYCLE_REPORT_KEY = "cycle.report";
Boolean DEFAULT_METADATA_REPORT_CYCLE_REPORT = true;
+
+ String USER_HOME = "user.home";
+
+ String CACHE = ".cache";
+
+ String DUBBO_METADATA = "/.dubbo/dubbo-metadata-";
}