From 4450b0eb0b92de3a260f2e63dbdb1642ecaaa200 Mon Sep 17 00:00:00 2001 From: ascrutae Date: Wed, 7 Dec 2016 18:41:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../skywalking-toolkit-log4j-1.x/pom.xml | 2 +- .../eye/skywalking/agent/SkyWalkingAgent.java | 2 -- .../client/Agent2RoutingClient.java | 4 +-- .../a/eye/skywalking/logging/EasyLogger.java | 27 ++++++++----------- .../a/eye/skywalking/logging/LogLevel.java | 8 ++++++ .../pom.xml | 9 ------- 6 files changed, 22 insertions(+), 30 deletions(-) create mode 100644 skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml index 2a7540b47..7b4c46b39 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml @@ -16,7 +16,7 @@ log4j log4j 1.2.17 - compile + provided diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java index c64dc67b0..188261898 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java @@ -1,7 +1,6 @@ package com.a.eye.skywalking.agent; import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher; -import com.a.eye.skywalking.client.Agent2RoutingClient; import com.a.eye.skywalking.conf.Config; import com.a.eye.skywalking.conf.ConfigInitializer; import com.a.eye.skywalking.logging.EasyLogResolver; @@ -37,7 +36,6 @@ public class SkyWalkingAgent { initConfig(); - Agent2RoutingClient.INSTANCE.onReady(); final PluginDefineCategory pluginDefineCategory = PluginDefineCategory.category(new PluginBootstrap().loadPlugins()); new AgentBuilder.Default().type(enhanceClassMatcher(pluginDefineCategory).and(not(isInterface()))).transform(new AgentBuilder.Transformer() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java index a96af9931..13ab0ad04 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java @@ -10,14 +10,12 @@ import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.network.Client; import com.a.eye.skywalking.network.grpc.AckSpan; import com.a.eye.skywalking.network.grpc.RequestSpan; -import com.a.eye.skywalking.network.grpc.SendResult; import com.a.eye.skywalking.network.grpc.client.SpanStorageClient; import com.a.eye.skywalking.network.listener.client.StorageClientListener; import java.util.ArrayList; import java.util.List; import java.util.Random; -import java.util.concurrent.locks.LockSupport; /** * Created by wusheng on 2016/11/27. @@ -46,6 +44,8 @@ public class Agent2RoutingClient extends Thread { addrList.add(new ServerAddr(addrSegments[0], addrSegments[1])); } listener = new NetworkListener(); + + onReady(); } public void onReady() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java index e8e74cb3d..c9bd7b471 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java @@ -7,6 +7,8 @@ import java.net.URLEncoder; import java.text.SimpleDateFormat; import java.util.Date; +import static com.a.eye.skywalking.logging.LogLevel.*; + /** * Created by xin on 16-6-23. */ @@ -18,14 +20,14 @@ public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { this.toBeLoggerClass = toBeLoggerClass; } - public void logger(String level, String message, Throwable e) { + public void logger(LogLevel level, String message, Throwable e) { Throwable dummyException = new Throwable(); StackTraceElement locations[] = dummyException.getStackTrace(); if (locations != null && locations.length > 2) { - if(ERROR.equals(level) || WARN.equals(level)){ + if (ERROR.equals(level) || WARN.equals(level)) { WriterFactory.getLogWriter().writeError(formatMessage(level, message, locations[2])); - }else { + } else { WriterFactory.getLogWriter().write(formatMessage(level, message, locations[2])); } } @@ -53,18 +55,11 @@ public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { } - private String formatMessage(String level, String message, StackTraceElement caller) { + private String formatMessage(LogLevel level, String message, StackTraceElement caller) { return level + " " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + " " + caller.getClassName() + "." + caller.getMethodName() + "(" + caller.getFileName() + ":" + caller.getLineNumber() + ") " + message; } - - private static final String ERROR = "ERROR"; - private static final String WARN = "WARN"; - private static final String DEBUG = "DEBUG"; - private static final String INFO = "INFO"; - - @Override public void info(String format) { logger(INFO, format, null); @@ -72,17 +67,17 @@ public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { @Override public void info(String format, Object... arguments) { - logger(INFO, replaceParam(INFO, format, arguments), null); + logger(INFO, replaceParam(format, arguments), null); } @Override public void warn(String format, Object... arguments) { - logger(WARN, replaceParam(WARN, format, arguments), null); + logger(WARN, replaceParam(format, arguments), null); } @Override public void warn(String format, Object arguments, Throwable e) { - logger(WARN, replaceParam(WARN, format, arguments), e); + logger(WARN, replaceParam(format, arguments), e); } @Override @@ -92,7 +87,7 @@ public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { @Override public void error(String format, Object arguments, Throwable e) { - logger(ERROR, replaceParam(ERROR, format, arguments), e); + logger(ERROR, replaceParam(format, arguments), e); } @Override @@ -122,6 +117,6 @@ public class EasyLogger implements com.a.eye.skywalking.logging.api.ILog { @Override public void debug(String format, Object... arguments) { - logger(DEBUG, replaceParam(DEBUG, format, arguments), null); + logger(DEBUG, replaceParam(format, arguments), null); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java new file mode 100644 index 000000000..61a84a5fb --- /dev/null +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/LogLevel.java @@ -0,0 +1,8 @@ +package com.a.eye.skywalking.logging; + +/** + * Created by xin on 2016/12/7. + */ +public enum LogLevel { + INFO, DEBUG, WARN, ERROR +} diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml index f139d0faa..d4e9a17cd 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/pom.xml @@ -10,13 +10,4 @@ 4.0.0 skywalking-toolkit-log4j-1.x-activation - - - - com.a.eye - skywalking-toolkit-log4j-1.x - ${project.version} - compile - - -- GitLab