kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复部分问题

This commit is contained in:
ascrutae 2016-12-14 14:48:41 +08:00
parent 4eff915cea
commit 53f16f6c8b
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skywalking-commons/skywalking-registry/src/test/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenterTest.java
View File

@ -27,12 +27,12 @@ public class ZookeeperRegistryCenterTest extends TestSuite {
@Before
public void setUp() throws Exception {
zkTestServer = new TestingServer(2181, true);
zkClient = new ZkClient("127.0.0.1:2181", 2000);
zkTestServer = new TestingServer(42181, true);
zkClient = new ZkClient("127.0.0.1:42181", 2000);
registryCenter = RegistryCenterFactory.INSTANCE.getRegistryCenter(CenterType.DEFAULT_CENTER_TYPE);
Properties config = new Properties();
config.put(ZookeeperConfig.CONNECT_URL, "127.0.0.1:2181");
config.put(ZookeeperConfig.CONNECT_URL, "127.0.0.1:42181");
registryCenter.start(config);
}

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v1/x/PrintTraceIdInterceptor.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.log4j.v1.x;
package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x;
import com.a.eye.skywalking.api.Tracing;
import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext;

4
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v1/x/TraceIdPatternConverterActivation.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.log4j.v1.x;
package com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x;
import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint;
import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint;
@ -30,7 +30,7 @@ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhan
@Override
public String getMethodsInterceptor() {
return "com.a.eye.skywalking.toolkit.activation.log4j.v1.x.PrintTraceIdInterceptor";
return "PrintTraceIdInterceptor";
}
}};
}

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
com.a.eye.skywalking.toolkit.activation.log4j.v1.x.TraceIdPatternConverterActivation
com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x.TraceIdPatternConverterActivation

6
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/Log4j2OutputAppenderActivation.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.log4j.v2.x;
package com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x;
import com.a.eye.skywalking.plugin.interceptor.MethodMatcher;
import com.a.eye.skywalking.plugin.interceptor.StaticMethodsInterceptPoint;
@ -11,7 +11,7 @@ import com.a.eye.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePluginDefine {
@Override
protected String enhanceClassName() {
return "com.a.eye.skywalking.toolkit.log4j.v2.x.Log4j2OutputAppender";
return "com.a.eye.skywalking.toolkit.log.log4j.v2.x.Log4j2OutputAppender";
}
@Override
@ -24,7 +24,7 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu
@Override
public String getMethodsInterceptor() {
return "com.a.eye.skywalking.toolkit.activation.log4j.v2.x.PrintTraceIdInterceptor";
return "PrintTraceIdInterceptor";
}
}};
}

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log4j/v2/x/PrintTraceIdInterceptor.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.log4j.v2.x;
package com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x;
import com.a.eye.skywalking.api.Tracing;
import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext;

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
com.a.eye.skywalking.toolkit.activation.log4j.v2.x.Log4j2OutputAppenderActivation
com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x.Log4j2OutputAppenderActivation

6
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/logback/v1/x/LogbackPatternConverterActivation.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.logback.v1.x;
package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x;
import com.a.eye.skywalking.plugin.interceptor.ConstructorInterceptPoint;
import com.a.eye.skywalking.plugin.interceptor.InstanceMethodsInterceptPoint;
@ -12,7 +12,7 @@ import com.a.eye.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine {
@Override
protected String enhanceClassName() {
return "com.a.eye.skywalking.toolkit.logback.v1.x.LogbackPatternConverter";
return "com.a.eye.skywalking.toolkit.log.logback.v1.x.LogbackPatternConverter";
}
@Override
@ -30,7 +30,7 @@ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhan
@Override
public String getMethodsInterceptor() {
return "com.a.eye.skywalking.toolkit.activation.logback.v1.x.PrintTraceIdInterceptor";
return "PrintTraceIdInterceptor";
}
}};
}

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/logback/v1/x/PrintTraceIdInterceptor.java → skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java
View File

@ -1,4 +1,4 @@
package com.a.eye.skywalking.toolkit.activation.logback.v1.x;
package com.a.eye.skywalking.toolkit.activation.log.logback.v1.x;
import com.a.eye.skywalking.api.Tracing;
import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext;

2
skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +1 @@
com.a.eye.skywalking.toolkit.activation.logback.v1.x.LogbackPatternConverterActivation
com.a.eye.skywalking.toolkit.activation.log.logback.v1.x.LogbackPatternConverterActivation