You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/09/19 05:35:49 UTC
[kylin] 03/06: KYLIN-3439,
make default kylin.web.timezone in KylinConfigBase the same with
kylin-defaults.properties
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
commit 11387aba88d81fea074563d85125e820b8d74202
Author: tttMelody <24...@qq.com>
AuthorDate: Thu Jul 5 13:38:16 2018 +0800
KYLIN-3439, make default kylin.web.timezone in KylinConfigBase the same with kylin-defaults.properties
---
.../src/main/java/org/apache/kylin/common/KylinConfigBase.java | 7 ++++++-
core-common/src/main/resources/kylin-defaults.properties | 2 +-
.../test/java/org/apache/kylin/rest/service/AdminServiceTest.java | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 79750e0..aa776e4 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.SortedSet;
+import java.util.TimeZone;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -1610,7 +1611,11 @@ abstract public class KylinConfigBase implements Serializable {
// ============================================================================
public String getTimeZone() {
- return getOptional("kylin.web.timezone", "PST");
+ String timezone = getOptional("kylin.web.timezone");
+ if (StringUtils.isBlank(timezone)) {
+ timezone = TimeZone.getDefault().getID();
+ }
+ return timezone;
}
public boolean isWebCrossDomainEnabled() {
diff --git a/core-common/src/main/resources/kylin-defaults.properties b/core-common/src/main/resources/kylin-defaults.properties
index 66e2fca..6f2db9a 100644
--- a/core-common/src/main/resources/kylin-defaults.properties
+++ b/core-common/src/main/resources/kylin-defaults.properties
@@ -41,7 +41,7 @@ kylin.server.mode=all
kylin.server.cluster-servers=localhost:7070
# Display timezone on UI,format like[GMT+N or GMT-N]
-kylin.web.timezone=GMT+8
+kylin.web.timezone=
# Timeout value for the queries submitted through the Web UI, in milliseconds
kylin.web.query-timeout=300000
diff --git a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
index 2ea5339..2a98991 100644
--- a/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
+++ b/server/src/test/java/org/apache/kylin/rest/service/AdminServiceTest.java
@@ -47,6 +47,7 @@ public class AdminServiceTest extends ServiceTestBase {
String path = Thread.currentThread().getContextClassLoader().getResource("kylin.properties").getPath();
KylinConfig config = KylinConfig.createInstanceFromUri(path);
+ String timeZone = config.getTimeZone();
try (SetAndUnsetThreadLocalConfig autoUnset = KylinConfig.setAndUnsetThreadLocalConfig(config)) {
String expected = "kylin.web.link-streaming-guide=http://kylin.apache.org/\n" +
@@ -55,7 +56,7 @@ public class AdminServiceTest extends ServiceTestBase {
"kylin.query.cache-enabled=true\n" +
"kylin.web.link-diagnostic=\n" +
"kylin.web.help.length=4\n" +
- "kylin.web.timezone=GMT+8\n" +
+ "kylin.web.timezone=\n" +
"kylin.server.external-acl-provider=\n" +
"kylin.tool.auto-migrate-cube.enabled=\n" +
"kylin.storage.default=2\n" +