This is an automated email from the ASF dual-hosted git repository. krisztiankasa pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new 14a6f80 AMBARI-24950 - Logsearch: use os timezone in Logfeeder (#2968) 14a6f80 is described below commit 14a6f80382c577deaec33b3ca574e07b77af5ecf Author: kasakrisz <33458261+kasakr...@users.noreply.github.com> AuthorDate: Wed May 8 08:09:26 2019 +0200 AMBARI-24950 - Logsearch: use os timezone in Logfeeder (#2968) --- .../loglevelfilter/LogLevelFilterHandler.java | 33 +++++++++------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/loglevelfilter/LogLevelFilterHandler.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/loglevelfilter/LogLevelFilterHandler.java index ab35f03..a9443a9 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/loglevelfilter/LogLevelFilterHandler.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/loglevelfilter/LogLevelFilterHandler.java @@ -18,7 +18,17 @@ */ package org.apache.ambari.logfeeder.loglevelfilter; -import com.google.gson.Gson; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; +import java.util.concurrent.ConcurrentHashMap; + +import javax.annotation.PostConstruct; +import javax.inject.Inject; + import org.apache.ambari.logfeeder.common.LogFeederConstants; import org.apache.ambari.logfeeder.conf.LogFeederProps; import org.apache.ambari.logfeeder.plugin.input.InputMarker; @@ -37,32 +47,16 @@ import org.apache.curator.framework.recipes.cache.TreeCacheListener; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; -import java.util.TreeMap; -import java.util.concurrent.ConcurrentHashMap; +import com.google.gson.Gson; public class LogLevelFilterHandler implements LogLevelFilterMonitor { private static final Logger LOG = LoggerFactory.getLogger(LogLevelFilterHandler.class); - private static final String TIMEZONE = "GMT"; private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS"; private static final boolean DEFAULT_VALUE = true; - private static ThreadLocal<DateFormat> formatter = new ThreadLocal<DateFormat>() { - protected DateFormat initialValue() { - SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT); - dateFormat.setTimeZone(TimeZone.getTimeZone(TIMEZONE)); - return dateFormat; - } - }; + private static ThreadLocal<DateFormat> formatter = ThreadLocal.withInitial(() -> new SimpleDateFormat(DATE_FORMAT)); @Inject private LogFeederProps logFeederProps; @@ -80,7 +74,6 @@ public class LogLevelFilterHandler implements LogLevelFilterMonitor { @PostConstruct public void init() throws Exception { - TimeZone.setDefault(TimeZone.getTimeZone(TIMEZONE)); if (logFeederProps.isZkFilterStorage() && logFeederProps.isUseLocalConfigs()) { LogLevelFilterManagerZK filterManager = (LogLevelFilterManagerZK) config.getLogLevelFilterManager(); CuratorFramework client = filterManager.getClient();