Repository: cassandra
Updated Branches:
  refs/heads/trunk a7e6e0f55 -> 3e6fe8bd2


use parameterized logging


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3e6fe8bd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3e6fe8bd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3e6fe8bd

Branch: refs/heads/trunk
Commit: 3e6fe8bd2874dbbbfe9dbe29e0cc073249d42001
Parents: a7e6e0f
Author: Dave Brosius <[email protected]>
Authored: Mon Mar 30 21:16:13 2015 -0400
Committer: Dave Brosius <[email protected]>
Committed: Mon Mar 30 21:16:13 2015 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/dht/RangeStreamer.java          | 2 +-
 src/java/org/apache/cassandra/gms/Gossiper.java               | 2 +-
 src/java/org/apache/cassandra/net/OutboundTcpConnection.java  | 4 ++--
 src/java/org/apache/cassandra/utils/CoalescingStrategies.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/dht/RangeStreamer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RangeStreamer.java 
b/src/java/org/apache/cassandra/dht/RangeStreamer.java
index fecb308..68c8a11 100644
--- a/src/java/org/apache/cassandra/dht/RangeStreamer.java
+++ b/src/java/org/apache/cassandra/dht/RangeStreamer.java
@@ -336,7 +336,7 @@ public class RangeStreamer
             Set<Range<Token>> availableRanges = 
stateStore.getAvailableRanges(keyspace, StorageService.getPartitioner());
             if (ranges.removeAll(availableRanges))
             {
-                logger.info(availableRanges + " already available. Skipping 
streaming.");
+                logger.info("Some ranges of {} are already available. Skipping 
streaming those ranges.", availableRanges);
             }
 
             if (logger.isDebugEnabled())

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java 
b/src/java/org/apache/cassandra/gms/Gossiper.java
index 07f2615..34f54a1 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -925,7 +925,7 @@ public class Gossiper implements 
IFailureDetectionEventListener, GossiperMBean
         for (IEndpointStateChangeSubscriber subscriber : subscribers)
             subscriber.onAlive(addr, localState);
         if (logger.isTraceEnabled())
-            logger.trace("Notified " + subscribers);
+            logger.trace("Notified {}", subscribers);
     }
 
     private void markDead(InetAddress addr, EndpointState localState)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java 
b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 9ea4660..dc43106 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -94,7 +94,7 @@ public class OutboundTcpConnection extends Thread
         case "MOVINGAVERAGE":
         case "FIXED":
         case "DISABLED":
-            logger.info("OutboundTcpConnection using coalescing strategy " + 
strategy);
+            logger.info("OutboundTcpConnection using coalescing strategy {}", 
strategy);
             break;
             default:
                 //Check that it can be loaded
@@ -103,7 +103,7 @@ public class OutboundTcpConnection extends Thread
 
         int coalescingWindow = DatabaseDescriptor.getOtcCoalescingWindow();
         if (coalescingWindow != Config.otc_coalescing_window_us_default)
-            logger.info("OutboundTcpConnection coalescing window set to " + 
coalescingWindow + "μs");
+            logger.info("OutboundTcpConnection coalescing window set to 
{}μs", coalescingWindow);
 
         if (coalescingWindow < 0)
             throw new ExceptionInInitializerError(

http://git-wip-us.apache.org/repos/asf/cassandra/blob/3e6fe8bd/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java 
b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
index ca1399b..7dba97b 100644
--- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
+++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -169,7 +169,7 @@ public class CoalescingStrategies
             if (DEBUG_COALESCING && shouldLogAverage)
             {
                 shouldLogAverage = false;
-                logger.info(toString() + " gap " + 
TimeUnit.NANOSECONDS.toMicros(averageGap) + "μs");
+                logger.info("{} gap {}μs", this, 
TimeUnit.NANOSECONDS.toMicros(averageGap));
             }
         }
 

Reply via email to