不再直接使用slf4j的api

lealone · Feb 23, 2017 · 557cd6f · 557cd6f
1 parent 9f9e189
commit 557cd6f
Show file tree

Hide file tree

Showing 54 changed files with 131 additions and 134 deletions.
diff --git a/lealone-aose/pom.xml b/lealone-aose/pom.xml
@@ -40,21 +40,6 @@
             <artifactId>guava</artifactId>
             <version>16.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.2</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-core</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
-            <version>1.1.2</version>
-        </dependency>
         <dependency>
             <groupId>com.boundary</groupId>
             <artifactId>high-scale-lib</artifactId>

diff --git a/lealone-aose/src/main/java/org/lealone/aose/concurrent/AbstractLealoneExecutorService.java b/lealone-aose/src/main/java/org/lealone/aose/concurrent/AbstractLealoneExecutorService.java
@@ -28,8 +28,8 @@
 
 import org.lealone.aose.util.JVMStabilityInspector;
 import org.lealone.common.concurrent.SimpleCondition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public abstract class AbstractLealoneExecutorService implements LealoneExecutorService {
     private static final Logger logger = LoggerFactory.getLogger(AbstractLealoneExecutorService.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/concurrent/DebuggableThreadPoolExecutor.java b/lealone-aose/src/main/java/org/lealone/aose/concurrent/DebuggableThreadPoolExecutor.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * This class encorporates some Executor best practices for lealone.  Most of the executors in the system

diff --git a/lealone-aose/src/main/java/org/lealone/aose/concurrent/SEPWorker.java b/lealone-aose/src/main/java/org/lealone/aose/concurrent/SEPWorker.java
@@ -22,8 +22,8 @@
 import java.util.concurrent.locks.LockSupport;
 
 import org.lealone.aose.util.JVMStabilityInspector;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 final class SEPWorker extends AtomicReference<SEPWorker.Work> implements Runnable {
     private static final Logger logger = LoggerFactory.getLogger(SEPWorker.class);
@@ -48,6 +48,7 @@ final class SEPWorker extends AtomicReference<SEPWorker.Work> implements Runnabl
         thread.start();
     }
 
+    @Override
     public void run() {
         /**
          * we maintain two important invariants:

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/EchoVerbHandler.java b/lealone-aose/src/main/java/org/lealone/aose/gms/EchoVerbHandler.java
@@ -21,8 +21,8 @@
 import org.lealone.aose.net.MessageIn;
 import org.lealone.aose.net.MessageOut;
 import org.lealone.aose.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class EchoVerbHandler implements IVerbHandler<EchoMessage> {
     private static final Logger logger = LoggerFactory.getLogger(EchoVerbHandler.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/FailureDetector.java b/lealone-aose/src/main/java/org/lealone/aose/gms/FailureDetector.java
@@ -42,8 +42,8 @@
 import org.lealone.aose.util.BoundedStatsDeque;
 import org.lealone.aose.util.FileUtils;
 import org.lealone.aose.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * This FailureDetector is an implementation of the paper titled

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestAck2VerbHandler.java b/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestAck2VerbHandler.java
@@ -22,8 +22,8 @@
 
 import org.lealone.aose.net.IVerbHandler;
 import org.lealone.aose.net.MessageIn;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class GossipDigestAck2VerbHandler implements IVerbHandler<GossipDigestAck2> {
     private static final Logger logger = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestAckVerbHandler.java b/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestAckVerbHandler.java
@@ -26,8 +26,8 @@
 import org.lealone.aose.net.MessageIn;
 import org.lealone.aose.net.MessageOut;
 import org.lealone.aose.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class GossipDigestAckVerbHandler implements IVerbHandler<GossipDigestAck> {
     private static final Logger logger = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestSynVerbHandler.java b/lealone-aose/src/main/java/org/lealone/aose/gms/GossipDigestSynVerbHandler.java
@@ -29,8 +29,8 @@
 import org.lealone.aose.net.MessageIn;
 import org.lealone.aose.net.MessageOut;
 import org.lealone.aose.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class GossipDigestSynVerbHandler implements IVerbHandler<GossipDigestSyn> {
     private static final Logger logger = LoggerFactory.getLogger(GossipDigestSynVerbHandler.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/GossipShutdownVerbHandler.java b/lealone-aose/src/main/java/org/lealone/aose/gms/GossipShutdownVerbHandler.java
@@ -19,8 +19,8 @@
 
 import org.lealone.aose.net.IVerbHandler;
 import org.lealone.aose.net.MessageIn;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class GossipShutdownVerbHandler implements IVerbHandler<Void> {
     private static final Logger logger = LoggerFactory.getLogger(GossipShutdownVerbHandler.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/gms/Gossiper.java b/lealone-aose/src/main/java/org/lealone/aose/gms/Gossiper.java
@@ -57,8 +57,8 @@
 import org.lealone.aose.util.JVMStabilityInspector;
 import org.lealone.aose.util.Pair;
 import org.lealone.aose.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/AbstractReplicationStrategy.java b/lealone-aose/src/main/java/org/lealone/aose/locator/AbstractReplicationStrategy.java
@@ -28,8 +28,8 @@
 import org.cliffc.high_scale_lib.NonBlockingHashMap;
 import org.lealone.aose.util.Utils;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * A abstract parent for all replication strategies.

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/CloudstackSnitch.java b/lealone-aose/src/main/java/org/lealone/aose/locator/CloudstackSnitch.java
@@ -40,8 +40,8 @@
 import org.lealone.aose.util.JVMStabilityInspector;
 import org.lealone.aose.util.Utils;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * A snitch that assumes a Cloudstack Zone follows the typical convention

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/Ec2Snitch.java b/lealone-aose/src/main/java/org/lealone/aose/locator/Ec2Snitch.java
@@ -33,8 +33,8 @@
 import org.lealone.aose.util.FileUtils;
 import org.lealone.aose.util.Utils;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * A snitch that assumes an EC2 region is a DC and an EC2 availability_zone

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/GoogleCloudSnitch.java b/lealone-aose/src/main/java/org/lealone/aose/locator/GoogleCloudSnitch.java
@@ -33,8 +33,8 @@
 import org.lealone.aose.util.FileUtils;
 import org.lealone.aose.util.Utils;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * A snitch that assumes an GCE region is a DC and an GCE availability_zone

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/GossipingPropertyFileSnitch.java b/lealone-aose/src/main/java/org/lealone/aose/locator/GossipingPropertyFileSnitch.java
@@ -30,12 +30,10 @@
 import org.lealone.aose.util.Utils;
 import org.lealone.aose.util.WrappedRunnable;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
-public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch// implements
-// IEndpointStateChangeSubscriber
-{
+public class GossipingPropertyFileSnitch extends AbstractNetworkTopologySnitch {
     private static final Logger logger = LoggerFactory.getLogger(GossipingPropertyFileSnitch.class);
 
     private PropertyFileSnitch psnitch;
@@ -69,18 +67,21 @@ public GossipingPropertyFileSnitch(int refreshPeriodInSeconds) throws Configurat
                     PropertyFileSnitch.SNITCH_PROPERTIES_FILENAME);
         }
 
+        String fileName = null;
         try {
-            Utils.resourceToFile(SnitchProperties.RACKDC_PROPERTY_FILENAME);
+            fileName = System.getProperty(SnitchProperties.RACKDC_PROPERTY_FILENAME);
+            if (fileName == null)
+                fileName = SnitchProperties.RACKDC_PROPERTY_FILENAME;
+            Utils.resourceToFile(fileName);
             Runnable runnable = new WrappedRunnable() {
                 @Override
                 protected void runMayThrow() throws ConfigurationException {
                     reloadConfiguration();
                 }
             };
-            ResourceWatcher.watch(SnitchProperties.RACKDC_PROPERTY_FILENAME, runnable, refreshPeriodInSeconds * 1000);
+            ResourceWatcher.watch(fileName, runnable, refreshPeriodInSeconds * 1000);
         } catch (ConfigurationException ex) {
-            logger.error("{} found, but does not look like a plain file. Will not watch it for changes",
-                    SnitchProperties.RACKDC_PROPERTY_FILENAME);
+            logger.error("{} found, but does not look like a plain file. Will not watch it for changes", fileName);
         }
     }
 

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/NetworkTopologyStrategy.java b/lealone-aose/src/main/java/org/lealone/aose/locator/NetworkTopologyStrategy.java
@@ -33,8 +33,8 @@
 import org.lealone.aose.locator.TopologyMetaData.Topology;
 import org.lealone.aose.util.Utils;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 import com.google.common.collect.Multimap;
 
@@ -52,9 +52,10 @@
  * change in the number of tokens.
  */
 public class NetworkTopologyStrategy extends AbstractReplicationStrategy {
+
+    private static final Logger logger = LoggerFactory.getLogger(NetworkTopologyStrategy.class);
     private final IEndpointSnitch snitch;
     private final Map<String, Integer> datacenters;
-    private static final Logger logger = LoggerFactory.getLogger(NetworkTopologyStrategy.class);
 
     public NetworkTopologyStrategy(String dbName, TopologyMetaData metaData, IEndpointSnitch snitch,
             Map<String, String> configOptions) throws ConfigurationException {

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/PropertyFileSnitch.java b/lealone-aose/src/main/java/org/lealone/aose/locator/PropertyFileSnitch.java
@@ -31,8 +31,8 @@
 import org.lealone.aose.util.Utils;
 import org.lealone.aose.util.WrappedRunnable;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * Used to determine if two IP's are in the same datacenter or on the same rack.

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/ReconnectableSnitchHelper.java b/lealone-aose/src/main/java/org/lealone/aose/locator/ReconnectableSnitchHelper.java
@@ -25,8 +25,8 @@
 import org.lealone.aose.gms.IEndpointStateChangeSubscriber;
 import org.lealone.aose.gms.VersionedValue;
 import org.lealone.aose.net.MessagingService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 /**
  * Sidekick helper for snitches that want to reconnect from one IP addr for a node to another.

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/SimpleSeedProvider.java b/lealone-aose/src/main/java/org/lealone/aose/locator/SimpleSeedProvider.java
@@ -24,8 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class SimpleSeedProvider implements SeedProvider {
 

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/SnitchProperties.java b/lealone-aose/src/main/java/org/lealone/aose/locator/SnitchProperties.java
@@ -22,8 +22,8 @@
 import java.util.Properties;
 
 import org.lealone.aose.util.FileUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 public class SnitchProperties {
     private static final Logger logger = LoggerFactory.getLogger(SnitchProperties.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/locator/TopologyMetaData.java b/lealone-aose/src/main/java/org/lealone/aose/locator/TopologyMetaData.java
@@ -31,8 +31,8 @@
 import org.lealone.aose.gms.FailureDetector;
 import org.lealone.aose.server.StorageServer;
 import org.lealone.aose.util.Pair;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;

diff --git a/lealone-aose/src/main/java/org/lealone/aose/net/CoalescingStrategies.java b/lealone-aose/src/main/java/org/lealone/aose/net/CoalescingStrategies.java
@@ -29,8 +29,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.LockSupport;
 
+import org.lealone.common.logging.Logger;
 import org.lealone.db.Constants;
-import org.slf4j.Logger;
 
 import com.google.common.base.Preconditions;
 

diff --git a/lealone-aose/src/main/java/org/lealone/aose/net/IncomingTcpConnection.java b/lealone-aose/src/main/java/org/lealone/aose/net/IncomingTcpConnection.java
@@ -29,17 +29,17 @@
 import java.util.Set;
 import java.util.zip.Checksum;
 
-import net.jpountz.lz4.LZ4BlockInputStream;
-import net.jpountz.lz4.LZ4Factory;
-import net.jpountz.lz4.LZ4FastDecompressor;
-import net.jpountz.xxhash.XXHashFactory;
-
 import org.lealone.aose.concurrent.LealoneExecutorService;
 import org.lealone.aose.concurrent.StageManager;
 import org.lealone.aose.config.ConfigDescriptor;
 import org.lealone.aose.gms.Gossiper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
+
+import net.jpountz.lz4.LZ4BlockInputStream;
+import net.jpountz.lz4.LZ4Factory;
+import net.jpountz.lz4.LZ4FastDecompressor;
+import net.jpountz.xxhash.XXHashFactory;
 
 class IncomingTcpConnection extends Thread implements Closeable {
     private static final Logger logger = LoggerFactory.getLogger(IncomingTcpConnection.class);

diff --git a/lealone-aose/src/main/java/org/lealone/aose/net/MessageDeliveryTask.java b/lealone-aose/src/main/java/org/lealone/aose/net/MessageDeliveryTask.java
@@ -20,8 +20,8 @@
 import java.util.EnumSet;
 
 import org.lealone.aose.gms.Gossiper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 class MessageDeliveryTask implements Runnable {

diff --git a/lealone-aose/src/main/java/org/lealone/aose/net/MessagingService.java b/lealone-aose/src/main/java/org/lealone/aose/net/MessagingService.java
@@ -78,8 +78,8 @@
 import org.lealone.aose.util.Utils;
 import org.lealone.common.concurrent.SimpleCondition;
 import org.lealone.common.exceptions.ConfigurationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;

diff --git a/lealone-aose/src/main/java/org/lealone/aose/net/OutboundTcpConnection.java b/lealone-aose/src/main/java/org/lealone/aose/net/OutboundTcpConnection.java
@@ -35,11 +35,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.zip.Checksum;
 
-import net.jpountz.lz4.LZ4BlockOutputStream;
-import net.jpountz.lz4.LZ4Compressor;
-import net.jpountz.lz4.LZ4Factory;
-import net.jpountz.xxhash.XXHashFactory;
-
 import org.lealone.aose.config.Config;
 import org.lealone.aose.config.ConfigDescriptor;
 import org.lealone.aose.io.DataOutputStreamPlus;
@@ -51,11 +46,16 @@
 import org.lealone.aose.server.ClusterMetaData;
 import org.lealone.aose.util.JVMStabilityInspector;
 import org.lealone.aose.util.Utils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.lealone.common.logging.Logger;
+import org.lealone.common.logging.LoggerFactory;
 
 import com.google.common.util.concurrent.Uninterruptibles;
 
+import net.jpountz.lz4.LZ4BlockOutputStream;
+import net.jpountz.lz4.LZ4Compressor;
+import net.jpountz.lz4.LZ4Factory;
+import net.jpountz.xxhash.XXHashFactory;
+
 public class OutboundTcpConnection extends Thread {
     private static final Logger logger = LoggerFactory.getLogger(OutboundTcpConnection.class);