From 29d76e0914a7a7e4e89c4742d927f972302eb478 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Thu, 19 Oct 2017 20:03:00 +0800 Subject: [PATCH] fix tavis-ci build failed issue --- .../org/skywalking/apm/agent/core/logging/core/LogLevel.java | 2 +- .../org/skywalking/apm/agent/test/tools/AgentServiceRule.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/core/LogLevel.java b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/core/LogLevel.java index a6aa5d097657..dbc45c83942e 100644 --- a/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/core/LogLevel.java +++ b/apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/core/LogLevel.java @@ -22,5 +22,5 @@ * Created by xin on 2016/12/7. */ public enum LogLevel { - DEBUG, INFO, WARN, ERROR; + DEBUG, INFO, WARN, ERROR, OFF } diff --git a/apm-sniffer/apm-test-tools/src/main/java/org/skywalking/apm/agent/test/tools/AgentServiceRule.java b/apm-sniffer/apm-test-tools/src/main/java/org/skywalking/apm/agent/test/tools/AgentServiceRule.java index ebaad9f9d6f7..ebcfddd7780d 100644 --- a/apm-sniffer/apm-test-tools/src/main/java/org/skywalking/apm/agent/test/tools/AgentServiceRule.java +++ b/apm-sniffer/apm-test-tools/src/main/java/org/skywalking/apm/agent/test/tools/AgentServiceRule.java @@ -23,10 +23,12 @@ import org.junit.rules.ExternalResource; import org.skywalking.apm.agent.core.boot.BootService; import org.skywalking.apm.agent.core.boot.ServiceManager; +import org.skywalking.apm.agent.core.conf.Config; import org.skywalking.apm.agent.core.conf.RemoteDownstreamConfig; import org.skywalking.apm.agent.core.context.IgnoredTracerContext; import org.skywalking.apm.agent.core.context.TracingContext; import org.skywalking.apm.agent.core.context.TracingContextListener; +import org.skywalking.apm.agent.core.logging.core.LogLevel; import org.skywalking.apm.agent.test.helper.FieldSetter; public class AgentServiceRule extends ExternalResource { @@ -38,6 +40,7 @@ protected void after() { FieldSetter.setValue(ServiceManager.INSTANCE.getClass(), "bootedServices", new HashMap()); FieldSetter.setValue(IgnoredTracerContext.ListenerManager.class, "LISTENERS", new LinkedList()); FieldSetter.setValue(TracingContext.ListenerManager.class, "LISTENERS", new LinkedList()); + ServiceManager.INSTANCE.shutdown(); } catch (Exception e) { } } @@ -45,6 +48,7 @@ protected void after() { @Override protected void before() throws Throwable { super.before(); + Config.Logging.LEVEL = LogLevel.OFF; ServiceManager.INSTANCE.boot(); RemoteDownstreamConfig.Agent.APPLICATION_ID = 1; RemoteDownstreamConfig.Agent.APPLICATION_INSTANCE_ID = 1;