diff --git a/skywalking-logging/pom.xml b/skywalking-logging/pom.xml index 1032a39360b88409133cd7a77a046af66b2fa1c2..97579c9fb2bf9bd2e8b16bbdf8fc710d5aadf9f7 100644 --- a/skywalking-logging/pom.xml +++ b/skywalking-logging/pom.xml @@ -8,21 +8,13 @@ 4.0.0 skywalking-logging - jar + pom skywalking-logging http://maven.apache.org + + skywalking-logging-api + skywalking-logging-log4j-impl + - - UTF-8 - - - - - junit - junit - 3.8.1 - test - - diff --git a/skywalking-logging/skywalking-logging-api/pom.xml b/skywalking-logging/skywalking-logging-api/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..792273a8968710a39c6e4b23feb6664e2c090eb4 --- /dev/null +++ b/skywalking-logging/skywalking-logging-api/pom.xml @@ -0,0 +1,14 @@ + + + + skywalking-logging + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-logging-api + + diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java similarity index 85% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java index 9a27cdf3b3c5248a347df54c110244578263fdf3..656d36305e9a95c6e099fe93ce6fa94cc6f89658 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/ILog.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/ILog.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java similarity index 90% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java index 19faba471445872a43c6a08e100c80d7f036b0ee..6683ef226922e97f6f035c5d2f76dcc695c1a1d1 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogManager.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogManager.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java similarity index 72% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java index 7e4853dc92280e08a167fea53d224481c6556fb0..627792ea37991f4761e585bc1a8d1073ae411b58 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/LogResolver.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/LogResolver.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** * Created by xin on 2016/11/10. diff --git a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java similarity index 91% rename from skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java rename to skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java index 236df43bb6f8ef8422495e0d577ae4bb8c02bcc2..f1491875e0852a41e76be8ec5e9edf227c013d31 100644 --- a/skywalking-logging/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java +++ b/skywalking-logging/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/api/NoopLogger.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.logging; +package com.a.eye.skywalking.logging.api; /** diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml b/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml new file mode 100644 index 0000000000000000000000000000000000000000..2a6ca973357909f39ed8869abd64ea412307fff5 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/pom.xml @@ -0,0 +1,27 @@ + + + + skywalking-logging + com.a.eye + 2.0-2016 + + 4.0.0 + + skywalking-logging-log4j-impl + + + + com.a.eye + skywalking-logging-api + ${project.version} + + + + org.apache.logging.log4j + log4j-core + 2.4.1 + + + diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java new file mode 100644 index 0000000000000000000000000000000000000000..50bb95e22191ba9ac275cebdb4ba5603185aec83 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Logger.java @@ -0,0 +1,35 @@ +package com.a.eye.skywalking.logging.impl.log4j2; + +import com.a.eye.skywalking.logging.api.ILog; +import org.apache.logging.log4j.Logger; + +/** + * Created by wusheng on 2016/11/11. + */ +public class Log4j2Logger implements ILog { + private Logger logger; + + public Log4j2Logger(Logger logger) { + this.logger = logger; + } + + @Override + public void info(String message) { + logger.info(message); + } + + @Override + public void info(String message, Object... arguments) { + logger.info(message, arguments); + } + + @Override + public void error(String message, Throwable e) { + logger.error(message, e); + } + + @Override + public void error(String message, Object argument, Throwable e) { + logger.error(message, argument, e); + } +} diff --git a/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java new file mode 100644 index 0000000000000000000000000000000000000000..de0d9ca204cbd8eec19e89239d8dcba7f9cb94d0 --- /dev/null +++ b/skywalking-logging/skywalking-logging-impl-log4j2/src/main/java/com/a/eye/skywalking/logging/impl/log4j2/Log4j2Resolver.java @@ -0,0 +1,15 @@ +package com.a.eye.skywalking.logging.impl.log4j2; + +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogResolver; +import org.apache.logging.log4j.LogManager; + +/** + * Created by wusheng on 2016/11/11. + */ +public class Log4j2Resolver implements LogResolver { + @Override + public ILog getLogger(Class clazz) { + return new Log4j2Logger(LogManager.getLogger(clazz)); + } +} diff --git a/skywalking-registry/pom.xml b/skywalking-registry/pom.xml index 64669e99aa8b507466698106840824ff99d5a2ba..a8375e5ea6bc37b684bf8b89ac94a9be13c1f86d 100644 --- a/skywalking-registry/pom.xml +++ b/skywalking-registry/pom.xml @@ -25,7 +25,7 @@ com.a.eye - skywalking-logging + skywalking-logging-api ${project.version} diff --git a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java index f44d4a3964553162bca16554cfac0c4bdbbcc04c..93d83b8ccbe6a6f312cab49248ed8bdd7ce25958 100644 --- a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java +++ b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperConfig.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.registry.impl.zookeeper; -import com.a.eye.skywalking.logging.ILog; -import com.a.eye.skywalking.logging.LogManager; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import java.util.Properties; diff --git a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java index 7173ae51b4b0a7bbf7cec1ea08a6a89a8936ebd9..9702456078bc299954bf55004bf534635bf001ff 100644 --- a/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java +++ b/skywalking-registry/src/main/java/com/a/eye/skywalking/registry/impl/zookeeper/ZookeeperRegistryCenter.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.registry.impl.zookeeper; -import com.a.eye.skywalking.logging.ILog; -import com.a.eye.skywalking.logging.LogManager; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.registry.api.*; import org.apache.zookeeper.*; diff --git a/skywalking-storage-center/skywalking-storage/pom.xml b/skywalking-storage-center/skywalking-storage/pom.xml index dced15cdda9957d97cc4c975eaaf93c28df55979..48e665f54017736b992d2bb7c3b896dac25714dd 100644 --- a/skywalking-storage-center/skywalking-storage/pom.xml +++ b/skywalking-storage-center/skywalking-storage/pom.xml @@ -16,21 +16,15 @@ - junit - junit - 4.12 - test + com.a.eye + skywalking-network + ${project.version} com.a.eye skywalking-registry ${project.version} - - org.apache.logging.log4j - log4j-core - 2.4.1 - org.hsqldb hsqldb @@ -41,6 +35,13 @@ data-carrier 1.0 + + + junit + junit + 4.12 + test + diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java index 2e44a0c0c6074234ba31c087f01770edd172df78..dcde0e2f764c40a3212e522f83bbd9fa17c48182 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/BlockIndexUpdator.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.storage.block.index; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.storage.block.index.exception.BlockIndexPersistenceFailedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.io.*; import java.util.ArrayList; @@ -14,7 +14,7 @@ import static com.a.eye.skywalking.storage.config.Config.BlockIndex.STORAGE_BASE public class BlockIndexUpdator { - private static Logger logger = LogManager.getLogger(BlockIndexUpdator.class); + private static ILog logger = LogManager.getLogger(BlockIndexUpdator.class); private L1Cache l1Cache; private L2Cache l2Cache; @@ -64,8 +64,7 @@ public class BlockIndexUpdator { List indexData = new ArrayList<>(); BufferedReader indexFileReader = null; try { - indexFileReader = - new BufferedReader(new FileReader(new File(STORAGE_BASE_PATH, DATA_FILE_INDEX_FILE_NAME))); + indexFileReader = new BufferedReader(new FileReader(new File(STORAGE_BASE_PATH, DATA_FILE_INDEX_FILE_NAME))); String indexDataStr = null; while ((indexDataStr = indexFileReader.readLine()) != null) { indexData.add(Long.parseLong(indexDataStr)); diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java index f8f9a3e65518eabb4e1cf32832ede7cda5a7d8dd..4f2281e736c483df913b397c238dda1722a2d2ed 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/block/index/L1Cache.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.storage.block.index; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import java.util.List; import java.util.TreeSet; @@ -11,13 +11,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; /** * 块索引的一级缓存 - * + *

* Created by xin on 2016/11/2. */ public class L1Cache { private static final int MAX_DATA_KEEP_SIZE = 30; - private static Logger logger = LogManager.getLogger(L1Cache.class); + private static ILog logger = LogManager.getLogger(L1Cache.class); private TreeSet cacheData = new TreeSet(); private final ReadWriteLock updateLock = new ReentrantReadWriteLock(); diff --git a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java index 608ee39afe6421758b5e35699409f74576e2d457..066c096199f0f51c4c6c84e42550bd62ab6af4d4 100644 --- a/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java +++ b/skywalking-storage-center/skywalking-storage/src/main/java/com/a/eye/skywalking/storage/data/IndexDataCapacityMonitor.java @@ -1,10 +1,9 @@ package com.a.eye.skywalking.storage.data; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.storage.block.index.BlockIndexEngine; import com.a.eye.skywalking.storage.data.index.IndexDBConnector; -import org.apache.jute.Index; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import java.sql.SQLException; import java.util.concurrent.atomic.AtomicLong; @@ -16,7 +15,7 @@ import static com.a.eye.skywalking.storage.config.Config.DataIndex.MAX_CAPACITY_ */ public class IndexDataCapacityMonitor extends Thread { - private static Logger logger = LogManager.getLogger(IndexDataCapacityMonitor.class); + private static ILog logger = LogManager.getLogger(IndexDataCapacityMonitor.class); private static Detector detector; public static void addIndexData(long timestamp, int size) {