Repository: kylin Updated Branches: refs/heads/master e8ed22309 -> 8f5442bff
KYLIN-1963 remove Log4jConfiguer Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7f04a2bd Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7f04a2bd Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7f04a2bd Branch: refs/heads/master Commit: 7f04a2bd8e1b8080a4410b85ad9d2113776b084a Parents: e8ed223 Author: Hongbin Ma <mahong...@apache.org> Authored: Thu Aug 18 09:42:04 2016 +0800 Committer: Hongbin Ma <mahong...@apache.org> Committed: Thu Aug 18 09:42:09 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/common/KylinConfig.java | 4 -- .../kylin/common/util/Log4jConfigurer.java | 40 -------------------- 2 files changed, 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7f04a2bd/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java index 157b43c..241170a 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfig.java @@ -35,7 +35,6 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.kylin.common.restclient.RestClient; import org.apache.kylin.common.util.ClassUtil; -import org.apache.kylin.common.util.Log4jConfigurer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -45,9 +44,6 @@ public class KylinConfig extends KylinConfigBase { private static final long serialVersionUID = 1L; private static final Logger logger = LoggerFactory.getLogger(KylinConfig.class); - static { - Log4jConfigurer.initLogger(); - } /** Kylin properties file name */ public static final String KYLIN_CONF_PROPERTIES_FILE = "kylin.properties"; http://git-wip-us.apache.org/repos/asf/kylin/blob/7f04a2bd/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java b/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java deleted file mode 100644 index a3a3e52..0000000 --- a/core-common/src/main/java/org/apache/kylin/common/util/Log4jConfigurer.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ - -package org.apache.kylin.common.util; - -import java.io.InputStream; - -import org.apache.commons.io.IOUtils; - -public class Log4jConfigurer { - private static boolean INITIALIZED = false; - - public static synchronized void initLogger() { - if (!INITIALIZED && !isConfigured()) { - System.out.println("Initing the logger"); - InputStream is = Log4jConfigurer.class.getClassLoader().getResourceAsStream("kylin-log4j.properties"); - IOUtils.closeQuietly(is); - } - INITIALIZED = true; - } - - private static boolean isConfigured() { - return false; - } -}
