You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/09/19 08:34:17 UTC
[dolphinscheduler] 06/07: Add debug logs for properties read from `common.properties` (#11910)
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch 3.1.0-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 6f7ba2c634c175832408ee9b985d7a9fb57fd8ea
Author: Wenjun Ruan <we...@apache.org>
AuthorDate: Thu Sep 15 10:53:19 2022 +0800
Add debug logs for properties read from `common.properties` (#11910)
---
.../dolphinscheduler/common/utils/PropertyUtils.java | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java
index ab4c25b8d6..554a98ac94 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/PropertyUtils.java
@@ -17,10 +17,10 @@
package org.apache.dolphinscheduler.common.utils;
+import static org.apache.dolphinscheduler.common.Constants.COMMON_PROPERTIES_PATH;
+
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.spi.enums.ResUploadType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
@@ -28,8 +28,11 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Strings;
-import static org.apache.dolphinscheduler.common.Constants.COMMON_PROPERTIES_PATH;
public class PropertyUtils {
@@ -48,7 +51,12 @@ public class PropertyUtils {
public static synchronized void loadPropertyFile(String... propertyFiles) {
for (String fileName : propertyFiles) {
try (InputStream fis = PropertyUtils.class.getResourceAsStream(fileName);) {
- properties.load(fis);
+ Properties subProperties = new Properties();
+ subProperties.load(fis);
+ subProperties.forEach((k, v) -> {
+ logger.debug("Get property {} -> {}", k, v);
+ });
+ properties.putAll(subProperties);
} catch (IOException e) {
logger.error(e.getMessage(), e);
System.exit(1);
@@ -68,7 +76,8 @@ public class PropertyUtils {
*/
public static boolean getResUploadStartupState() {
String resUploadStartupType = PropertyUtils.getUpperCaseString(Constants.RESOURCE_STORAGE_TYPE);
- ResUploadType resUploadType = ResUploadType.valueOf(Strings.isNullOrEmpty(resUploadStartupType) ? ResUploadType.NONE.name() : resUploadStartupType);
+ ResUploadType resUploadType = ResUploadType.valueOf(
+ Strings.isNullOrEmpty(resUploadStartupType) ? ResUploadType.NONE.name() : resUploadStartupType);
return resUploadType != ResUploadType.NONE;
}