Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 2fb84f146 -> aa3e51183
IGNITE-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/aa3e5118 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/aa3e5118 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/aa3e5118 Branch: refs/heads/ignite-843-rc2 Commit: aa3e51183875313bc6b215e85b22e6ec0d0d4655 Parents: 2fb84f1 Author: Andrey <anovi...@gridgain.com> Authored: Mon Dec 28 09:43:39 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Dec 28 09:43:39 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/agent/AgentLauncher.java | 5 -- .../ignite/agent/AgentLoggingConfigurator.java | 88 -------------------- 2 files changed, 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/aa3e5118/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java index 7d68f81..82a8507 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLauncher.java @@ -41,11 +41,6 @@ public class AgentLauncher { /** */ private static final int RECONNECT_INTERVAL = 3000; - /** Static initializer. */ - static { - AgentLoggingConfigurator.configure(); - } - /** * @param args Args. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/aa3e5118/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java b/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java deleted file mode 100644 index 3a4cd44..0000000 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/agent/AgentLoggingConfigurator.java +++ /dev/null @@ -1,88 +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.ignite.agent; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.logging.LogManager; - -/** - * Configurator for java.util.Logger. - */ -public class AgentLoggingConfigurator { - /** */ - private static final String CFG_PATH_PROPERTY = "log.config.path"; - - /** */ - private static final String PROPERTIES_FILE = "logging.properties"; - - /** - * Perform configure. - */ - public static void configure() { -// try { -// if (System.getProperty(CFG_PATH_PROPERTY) != null) { -// File logCfg = new File(System.getProperty(CFG_PATH_PROPERTY)); -// -// if (!logCfg.isFile()) { -// System.err.println("Failed to load logging configuration, file not found: " + logCfg); -// -// System.exit(1); -// } -// -//// readConfiguration(logCfg); -// -// return; -// } - -// File agentHome = AgentUtils.getAgentHome(); - -// if (agentHome != null) { -// File logCfg = new File(agentHome, PROPERTIES_FILE); -// -// if (logCfg.isFile()) { -// readConfiguration(logCfg); -// -// return; -// } -// } -// -// LogManager.getLogManager().readConfiguration(AgentLauncher.class.getResourceAsStream("/" -// + PROPERTIES_FILE)); -// } -// catch (IOException e) { -// System.err.println("Failed to load logging configuration."); -// -// e.printStackTrace(); -// -// System.exit(1); -// } - } - -// /** -// * @param file File. -// */ -// private static void readConfiguration(File file) throws IOException { -// try (InputStream in = new BufferedInputStream(new FileInputStream(file))) { -// LogManager.getLogManager().readConfiguration(in); -// } -// } -}
