Merge pull request OpenHFT#68 from lburgazzoli/HFT-HCOLL-47

lburgazzoli · lburgazzoli · commit 65b9cd571e03 · 2014-05-17T15:00:41.000+02:00
HCOLL-47 Change all logging statements to use the slf4j-api
diff --git a/chronicle-sandbox/pom.xml b/chronicle-sandbox/pom.xml
@@ -66,6 +66,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.sun.java</groupId>
             <artifactId>tools</artifactId>
@@ -94,6 +99,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/chronicle-sandbox/src/main/java/net/openhft/chronicle/sandbox/JournalRecord.java b/chronicle-sandbox/src/main/java/net/openhft/chronicle/sandbox/JournalRecord.java
@@ -17,11 +17,12 @@
 package net.openhft.chronicle.sandbox;
 
 import net.openhft.lang.io.NativeBytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.util.logging.Logger;
 
 public class JournalRecord extends NativeBytes {
-    private static final Logger LOGGER = Logger.getLogger(JournalRecord.class.getName());
+    private static final Logger LOGGER = LoggerFactory.getLogger(JournalRecord.class);
     // int read write lock
     private static final int READ_WRITE_LOCK = -8;
     // int data size
@@ -58,7 +59,7 @@ private boolean writeLock0(long timeOutMS) {
                 timeOutMS--;
             last = now;
         } while (timeOutMS > 0);
-        LOGGER.warning("Grabbing write lock. count=" + readInt(READ_WRITE_LOCK));
+        LOGGER.warn("Grabbing write lock. count={}",readInt(READ_WRITE_LOCK));
         writeOrderedInt(READ_WRITE_LOCK, -1);
         return true;
     }
diff --git a/chronicle/pom.xml b/chronicle/pom.xml
@@ -72,6 +72,11 @@
             <artifactId>affinity</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+
         <!-- for testing -->
         <dependency>
             <groupId>org.easymock</groupId>
@@ -104,6 +109,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
diff --git a/chronicle/src/main/java/net/openhft/chronicle/VanillaFile.java b/chronicle/src/main/java/net/openhft/chronicle/VanillaFile.java
@@ -17,16 +17,20 @@
 package net.openhft.chronicle;
 
 import net.openhft.lang.io.NativeBytes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import sun.misc.Cleaner;
 import sun.nio.ch.DirectBuffer;
 
-import java.io.*;
+import java.io.Closeable;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.RandomAccessFile;
 import java.nio.ByteOrder;
 import java.nio.MappedByteBuffer;
 import java.nio.channels.FileChannel;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class VanillaFile implements Closeable {
     private final Logger logger;
@@ -40,7 +44,7 @@ public class VanillaFile implements Closeable {
     private volatile boolean closed = false;
 
     public VanillaFile(String basePath, String cycleStr, String name, int indexCount, long size, boolean forAppend) throws IOException {
-        logger = Logger.getLogger(VanillaFile.class.getName() + "." + name);
+        logger = LoggerFactory.getLogger(VanillaFile.class.getName() + "." + name);
         File dir = new File(basePath, cycleStr);
         this.indexCount = indexCount;
 
@@ -54,16 +58,13 @@ public VanillaFile(String basePath, String cycleStr, String name, int indexCount
 
         if (!dir.isDirectory()) {
             boolean created = dir.mkdirs();
-            if (logger.isLoggable(Level.FINE))
-                logger.fine("Created " + dir + " is " + created);
+            logger.trace("Created {} is {}",dir,created);
         }
         file = new File(dir, name);
         if (file.exists()) {
-            if (logger.isLoggable(Level.FINE))
-                logger.fine("Opening " + file);
+            logger.trace("Opening {}",file);
         } else if (forAppend) {
-            if (logger.isLoggable(Level.FINE))
-                logger.fine("Creating " + file);
+            logger.trace("Creating {}",file);
         } else {
             throw new FileNotFoundException(file.getAbsolutePath());
         }
@@ -105,9 +106,7 @@ public long baseAddr() {
     }
 
     private void close0() {
-        Logger logger = Logger.getLogger(getClass().getName());
-        if (logger.isLoggable(Level.FINE))
-            logger.fine("... Closing " + file);
+        LoggerFactory.getLogger(getClass()).trace("... Closing {}", file);
         Cleaner cleaner = ((DirectBuffer) map).cleaner();
         if (cleaner != null)
             cleaner.clean();
diff --git a/chronicle/src/main/java/net/openhft/chronicle/tcp/InProcessChronicleSink.java b/chronicle/src/main/java/net/openhft/chronicle/tcp/InProcessChronicleSink.java
@@ -16,10 +16,18 @@
 
 package net.openhft.chronicle.tcp;
 
-import net.openhft.chronicle.*;
+import net.openhft.chronicle.Chronicle;
+import net.openhft.chronicle.ChronicleConfig;
+import net.openhft.chronicle.Excerpt;
+import net.openhft.chronicle.ExcerptAppender;
+import net.openhft.chronicle.ExcerptCommon;
+import net.openhft.chronicle.ExcerptTailer;
+import net.openhft.chronicle.IndexedChronicle;
 import net.openhft.chronicle.tools.WrappedExcerpt;
 import net.openhft.lang.model.constraints.NotNull;
 import net.openhft.lang.model.constraints.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -29,8 +37,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.SocketChannel;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * This listens to a ChronicleSource and copies new entries. This SInk can be any number of excerpt behind the source
@@ -52,7 +58,7 @@ public class InProcessChronicleSink implements Chronicle {
     public InProcessChronicleSink(@NotNull Chronicle chronicle, String hostname, int port) throws IOException {
         this.chronicle = chronicle;
         this.address = new InetSocketAddress(hostname, port);
-        logger = Logger.getLogger(getClass().getName() + '.' + chronicle);
+        logger = LoggerFactory.getLogger(getClass().getName() + '.' + chronicle);
         excerpt = chronicle.createAppender();
         readBuffer = TcpUtil.createBuffer(256 * 1024, ByteOrder.nativeOrder());
     }
@@ -135,10 +141,7 @@ private SocketChannel createConnection() {
                 return sc;
 
             } catch (IOException e) {
-                if (logger.isLoggable(Level.FINE))
-                    logger.log(Level.FINE, "Failed to connect to " + address + " retrying", e);
-                else if (logger.isLoggable(Level.INFO))
-                    logger.log(Level.INFO, "Failed to connect to " + address + " retrying " + e);
+                logger.info("Failed to connect to {} retrying", address, e);
             }
             try {
                 Thread.sleep(500);
@@ -226,10 +229,7 @@ private boolean readNextExcerpt(@NotNull SocketChannel sc) {
             excerpt.finish();
 //            System.out.println(" ri: " + excerpt.index());
         } catch (IOException e) {
-            if (logger.isLoggable(Level.FINE))
-                logger.log(Level.FINE, "Lost connection to " + address + " retrying", e);
-            else if (logger.isLoggable(Level.INFO))
-                logger.log(Level.INFO, "Lost connection to " + address + " retrying " + e);
+            logger.info("Lost connection to {} retrying", address, e);
             try {
                 sc.close();
             } catch (IOException ignored) {
@@ -243,7 +243,7 @@ void closeSocket(@Nullable SocketChannel sc) {
             try {
                 sc.close();
             } catch (IOException e) {
-                logger.warning("Error closing socket " + e);
+                logger.warn("Error closing socket", e);
             }
     }
 
diff --git a/chronicle/src/main/java/net/openhft/chronicle/tcp/InProcessChronicleSource.java b/chronicle/src/main/java/net/openhft/chronicle/tcp/InProcessChronicleSource.java
@@ -16,10 +16,18 @@
 
 package net.openhft.chronicle.tcp;
 
-import net.openhft.chronicle.*;
+import net.openhft.chronicle.Chronicle;
+import net.openhft.chronicle.ChronicleConfig;
+import net.openhft.chronicle.Excerpt;
+import net.openhft.chronicle.ExcerptAppender;
+import net.openhft.chronicle.ExcerptCommon;
+import net.openhft.chronicle.ExcerptTailer;
+import net.openhft.chronicle.IndexedChronicle;
 import net.openhft.chronicle.tools.WrappedExcerpt;
 import net.openhft.lang.model.constraints.NotNull;
 import net.openhft.lang.thread.NamedThreadFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -34,8 +42,6 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * A Chronicle as a service to be replicated to any number of clients.
@@ -74,7 +80,7 @@ public InProcessChronicleSource(@NotNull Chronicle chronicle, int port) throws I
         selector = Selector.open();
         server.register(selector, SelectionKey.OP_ACCEPT);
         name = chronicle.name() + "@" + port;
-        logger = Logger.getLogger(getClass().getName() + "." + name);
+        logger = LoggerFactory.getLogger(getClass().getName() + "." + name);
         service = Executors.newCachedThreadPool(new NamedThreadFactory(name, true));
         service.execute(new Acceptor());
     }
@@ -91,7 +97,7 @@ void pause() {
                 notifier.wait(HEARTBEAT_INTERVAL_MS / 2);
             }
         } catch (InterruptedException ie) {
-            logger.warning("Interrupt ignored");
+            logger.warn("Interrupt ignored");
         }
     }
 
@@ -143,9 +149,9 @@ public void close() {
             service.shutdownNow();
             service.awaitTermination(10000, java.util.concurrent.TimeUnit.MILLISECONDS);
         } catch (IOException e) {
-            logger.warning("Error closing server port " + e);
+            logger.warn("Error closing server port", e);
         } catch (InterruptedException ie) {
-            logger.warning("Error shutting down service threads " + ie);
+            logger.warn("Error shutting down service threads", ie);
         }
     }
 
@@ -170,11 +176,12 @@ public void run() {
                     }
                 }
             } catch (IOException e) {
-                if (!closed)
-                    logger.log(Level.SEVERE, "Acceptor dying", e);
+                if (!closed) {
+                    logger.warn("Acceptor dying", e);
+                }
             } finally {
                 service.shutdown();
-                logger.log(Level.INFO, "Acceptor loop ended");
+                logger.info("Acceptor loop ended");
             }
         }
     }
@@ -288,11 +295,13 @@ public void run() {
                 if (!closed) {
                     String msg = e.getMessage();
                     if (msg != null &&
-                            (msg.contains("reset by peer") || msg.contains("Broken pipe")
-                                    || msg.contains("was aborted by")))
-                        logger.log(Level.INFO, "Connect " + socket + " closed from the other end " + e);
-                    else
-                        logger.log(Level.INFO, "Connect " + socket + " died", e);
+                            (msg.contains("reset by peer")
+                                || msg.contains("Broken pipe")
+                                || msg.contains("was aborted by"))) {
+                        logger.info("Connect {} closed from the other end", socket, e);
+                    } else {
+                        logger.info("Connect {} died",socket, e);
+                    }
                 }
             }
         }
diff --git a/chronicle/src/main/java/net/openhft/chronicle/tcp/VanillaChronicleSink.java b/chronicle/src/main/java/net/openhft/chronicle/tcp/VanillaChronicleSink.java
@@ -16,10 +16,18 @@
 
 package net.openhft.chronicle.tcp;
 
-import net.openhft.chronicle.*;
+import net.openhft.chronicle.Chronicle;
+import net.openhft.chronicle.ChronicleConfig;
+import net.openhft.chronicle.Excerpt;
+import net.openhft.chronicle.ExcerptAppender;
+import net.openhft.chronicle.ExcerptCommon;
+import net.openhft.chronicle.ExcerptTailer;
+import net.openhft.chronicle.VanillaChronicle;
 import net.openhft.chronicle.tools.WrappedExcerpt;
 import net.openhft.lang.model.constraints.NotNull;
 import net.openhft.lang.model.constraints.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -29,8 +37,6 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.nio.channels.SocketChannel;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * This listens to a ChronicleSource and copies new entries.
@@ -56,7 +62,7 @@ public class VanillaChronicleSink implements Chronicle {
     public VanillaChronicleSink(@NotNull VanillaChronicle chronicle, String hostname, int port) throws IOException {
         this.chronicle = chronicle;
         this.address = new InetSocketAddress(hostname, port);
-        logger = Logger.getLogger(getClass().getName() + '.' + chronicle);
+        logger = LoggerFactory.getLogger(getClass().getName() + '.' + chronicle);
         excerpt = chronicle.createAppender();
         readBuffer = TcpUtil.createBuffer(256 * 1024, ByteOrder.nativeOrder());
     }
@@ -138,10 +144,7 @@ private SocketChannel createConnection() {
                 return sc;
 
             } catch (IOException e) {
-                if (logger.isLoggable(Level.FINE))
-                    logger.log(Level.FINE, "Failed to connect to " + address + " retrying", e);
-                else if (logger.isLoggable(Level.INFO))
-                    logger.log(Level.INFO, "Failed to connect to " + address + " retrying " + e);
+                logger.info("Failed to connect to {} retrying ", address, e);
             }
             try {
                 Thread.sleep(500);
@@ -219,10 +222,7 @@ private boolean readNextExcerpt(@NotNull SocketChannel sc) {
 
             excerpt.finish();
         } catch (IOException e) {
-            if (logger.isLoggable(Level.FINE))
-                logger.log(Level.FINE, "Lost connection to " + address + " retrying", e);
-            else if (logger.isLoggable(Level.INFO))
-                logger.log(Level.INFO, "Lost connection to " + address + " retrying " + e);
+            logger.info("Lost connection to {} retrying ",address, e);
             try {
                 sc.close();
             } catch (IOException ignored) {
@@ -236,7 +236,7 @@ void closeSocket(@Nullable SocketChannel sc) {
             try {
                 sc.close();
             } catch (IOException e) {
-                logger.warning("Error closing socket " + e);
+                logger.warn("Error closing socket", e);
             }
     }
 
diff --git a/chronicle/src/main/java/net/openhft/chronicle/tcp/VanillaChronicleSource.java b/chronicle/src/main/java/net/openhft/chronicle/tcp/VanillaChronicleSource.java
