use parameterized logging

zhoudaqing · May 24, 2016 · 9b5229a · 9b5229a
1 parent bca8d89
commit 9b5229a
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 34 deletions.
diff --git a/...ix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherCollapser.java b/...ix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherCollapser.java
@@ -246,7 +246,7 @@ public Long getValue() {
                 try {
                     return metrics.getCumulativeCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing CodaHale metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing CodaHale metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -269,7 +269,7 @@ public Long getValue() {
                 try {
                     return metrics.getRollingCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing CodaHale metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing CodaHale metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/...flix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherCommand.java b/...flix/hystrix/contrib/codahalemetricspublisher/HystrixCodaHaleMetricsPublisherCommand.java
@@ -503,7 +503,7 @@ public Long getValue() {
                 try {
                     return metrics.getCumulativeCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing CodaHale metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing CodaHale metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -526,7 +526,7 @@ public Long getValue() {
                 try {
                     return metrics.getRollingCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing CodaHale metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing CodaHale metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java b/...m/src/main/java/com/netflix/hystrix/contrib/metrics/eventstream/HystrixMetricsPoller.java
@@ -138,11 +138,11 @@ public boolean isRunning() {
     private final Object finalizerGuardian = new Object() {
         protected void finalize() throws Throwable {
             if (!executor.isShutdown()) {
-                logger.warn(HystrixMetricsPoller.class.getSimpleName() + " was not shutdown. Caught in Finalize Guardian and shutting down.");
+                logger.warn("{} was not shutdown. Caught in Finalize Guardian and shutting down.", HystrixMetricsPoller.class.getSimpleName());
                 try {
                     shutdown();
                 } catch (Exception e) {
-                    logger.error("Failed to shutdown " + HystrixMetricsPoller.class.getSimpleName(), e);
+                    logger.error("Failed to shutdown {}", HystrixMetricsPoller.class.getSimpleName(), e);
                 }
             }
         };
@@ -193,7 +193,7 @@ private void safelyWriteNumberField(JsonGenerator json, String name, Func0<Long>
             try {
                 json.writeNumberField(name, metricGenerator.call());
             } catch (NoSuchFieldError error) {
-                logger.error("While publishing Hystrix metrics stream, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                logger.error("While publishing Hystrix metrics stream, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                 json.writeNumberField(name, 0L);
             }
         }

diff --git a/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java b/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java
@@ -143,7 +143,7 @@ private void handleRequest(HttpServletRequest request, final HttpServletResponse
                         .subscribe(new Subscriber<SampleData>() {
                             @Override
                             public void onCompleted() {
-                                logger.error("HystrixSampleSseServlet: (" + getClass().getSimpleName() + ") received unexpected OnCompleted from sample stream");
+                                logger.error("HystrixSampleSseServlet: ({}) received unexpected OnCompleted from sample stream", getClass().getSimpleName());
                                 moreDataWillBeSent.set(false);
                             }
 

diff --git a/...a/com/netflix/hystrix/contrib/requestservlet/HystrixRequestLogViaLoggerServletFilter.java b/...a/com/netflix/hystrix/contrib/requestservlet/HystrixRequestLogViaLoggerServletFilter.java
@@ -80,7 +80,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
             try {
                 if (HystrixRequestContext.isCurrentThreadInitialized()) {
                     HystrixRequestLog log = HystrixRequestLog.getCurrentRequest();
-                    logger.info("Hystrix Executions [" + requestURL.toString() + "] => " + log.getExecutedCommandsAsString());
+                    logger.info("Hystrix Executions [{}] => {}", requestURL.toString(), log.getExecutedCommandsAsString());
                 }
             } catch (Exception e) {
                 logger.warn("Unable to append HystrixRequestLog", e);

diff --git a/...s-stream/src/main/java/com/netflix/hystrix/contrib/rxnetty/metricsstream/JsonMappers.java b/...s-stream/src/main/java/com/netflix/hystrix/contrib/rxnetty/metricsstream/JsonMappers.java
@@ -51,7 +51,7 @@ private static void safelyWriteNumberField(JsonGenerator json, String name, Func
         try {
             json.writeNumberField(name, metricGenerator.call());
         } catch (NoSuchFieldError error) {
-            logger.error("While publishing Hystrix metrics stream, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+            logger.error("While publishing Hystrix metrics stream, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!",name);
             json.writeNumberField(name, 0L);
         }
     }
@@ -361,4 +361,4 @@ public Long call() {
 
         return jsonString.getBuffer().toString();
     }
-}
+}
diff --git a/...ava/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherCollapser.java b/...ava/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherCollapser.java
@@ -133,7 +133,7 @@ public Long getValue() {
                 try {
                     return metrics.getCumulativeCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -156,7 +156,7 @@ public Long getValue() {
                 try {
                     return metrics.getRollingCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/.../java/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherCommand.java b/.../java/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherCommand.java
@@ -187,7 +187,7 @@ public Long getValue() {
                     HystrixEventType eventType = eventThunk.call();
                     return metrics.getCumulativeCount(HystrixRollingNumberEvent.from(eventType));
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -211,7 +211,7 @@ public Long getValue() {
                     HystrixEventType eventType = eventThunk.call();
                     return metrics.getRollingCount(HystrixRollingNumberEvent.from(eventType));
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/...va/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherThreadPool.java b/...va/com/netflix/hystrix/contrib/servopublisher/HystrixServoMetricsPublisherThreadPool.java
@@ -124,7 +124,7 @@ public Long getValue() {
                 try {
                     return metrics.getCumulativeCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -139,7 +139,7 @@ public Long getValue() {
                 try {
                     return metrics.getRollingCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Servo metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Servo metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -273,4 +273,4 @@ public Number getValue() {
         return monitors;
     }
 
-}
+}
diff --git a/...etflix/hystrix/contrib/yammermetricspublisher/HystrixYammerMetricsPublisherCollapser.java b/...etflix/hystrix/contrib/yammermetricspublisher/HystrixYammerMetricsPublisherCollapser.java
@@ -241,7 +241,7 @@ public Long value() {
                 try {
                     return metrics.getCumulativeCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Yammer metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Yammer metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -264,7 +264,7 @@ public Long value() {
                 try {
                     return metrics.getRollingCount(eventThunk.call());
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Yammer metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Yammer metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/.../netflix/hystrix/contrib/yammermetricspublisher/HystrixYammerMetricsPublisherCommand.java b/.../netflix/hystrix/contrib/yammermetricspublisher/HystrixYammerMetricsPublisherCommand.java
@@ -416,7 +416,7 @@ public Long value() {
                     HystrixRollingNumberEvent eventType = HystrixRollingNumberEvent.from(eventThunk.call());
                     return metrics.getCumulativeCount(eventType);
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Yammer metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Yammer metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }
@@ -450,7 +450,7 @@ public Long value() {
                     HystrixRollingNumberEvent eventType = HystrixRollingNumberEvent.from(eventThunk.call());
                     return metrics.getRollingCount(eventType);
                 } catch (NoSuchFieldError error) {
-                    logger.error("While publishing Yammer metrics, error looking up eventType for : " + name + ".  Please check that all Hystrix versions are the same!");
+                    logger.error("While publishing Yammer metrics, error looking up eventType for : {}.  Please check that all Hystrix versions are the same!", name);
                     return 0L;
                 }
             }

diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/HystrixObservableCollapser.java b/hystrix-core/src/main/java/com/netflix/hystrix/HystrixObservableCollapser.java
@@ -191,7 +191,7 @@ public void call(BatchReturnType batchReturnType) {
                                         // now add this to seenKeys, so we can later check what was seen, and what was unseen
                                         seenKeys.add(responseKey);
                                     } else {
-                                        logger.warn("Batch Response contained a response key not in request batch : " + responseKey);
+                                        logger.warn("Batch Response contained a response key not in request batch : {}", responseKey);
                                     }
                                 } catch (Throwable ex) {
                                     logger.warn("Uncaught error during demultiplexing of BatchResponse", ex);
@@ -581,4 +581,4 @@ public Setter andCollapserPropertiesDefaults(HystrixCollapserProperties.Setter p
     @SuppressWarnings("rawtypes")
     private static ConcurrentHashMap<Class<? extends HystrixObservableCollapser>, String> defaultNameCache = new ConcurrentHashMap<Class<? extends HystrixObservableCollapser>, String>();
 
-}
+}
diff --git a/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapserFactory.java b/hystrix-core/src/main/java/com/netflix/hystrix/collapser/RequestCollapserFactory.java
@@ -89,7 +89,7 @@ public RequestCollapser<BatchReturnType, ResponseType, RequestArgumentType> getR
         } else if (Scopes.GLOBAL == Scopes.valueOf(getScope().name())) {
             return getCollapserForGlobalScope(commandCollapser);
         } else {
-            logger.warn("Invalid Scope: " + getScope() + "  Defaulting to REQUEST scope.");
+            logger.warn("Invalid Scope: {}  Defaulting to REQUEST scope.", getScope());
             return getCollapserForUserRequest(commandCollapser);
         }
     }

diff --git a/...ava/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedArchaiusProperty.java b/...ava/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedArchaiusProperty.java
@@ -86,10 +86,10 @@ protected void checkAndFlip() {
             }
 
             if (this.isValueAcceptable()) {
-                logger.debug("Flipping property: " + getName() + " to use it's current value:" + getValue());
+                logger.debug("Flipping property: {} to use it's current value: {}", getName(), getValue());
                 pReference.set(this);
             } else {
-                logger.debug("Flipping property: " + getName() + " to use NEXT property: " + next);
+                logger.debug("Flipping property: {} to use NEXT property: {}", getName(), next);
                 pReference.set(next);
             }
 
@@ -155,7 +155,7 @@ public StringProperty(DynamicStringProperty sProperty, StringProperty next) {
             sProp.addCallback(new Runnable() {
                 @Override
                 public void run() {
-                    logger.debug("Property changed: '" + getName() + " = " + getValue() + "'");
+                    logger.debug("Property changed: '{} = {}'", getName(), getValue());
                     checkAndFlip();
                 }
             });
@@ -209,7 +209,7 @@ public IntegerProperty(DynamicIntegerProperty sProperty, IntegerProperty next) {
             sProp.addCallback(new Runnable() {
                 @Override
                 public void run() {
-                    logger.debug("Property changed: '" + getName() + " = " + getValue() + "'");
+                    logger.debug("Property changed: '{} = {}'", getName(), getValue());
                     checkAndFlip();
                 }
             });
@@ -263,7 +263,7 @@ public BooleanProperty(DynamicBooleanProperty sProperty, BooleanProperty next) {
             sProp.addCallback(new Runnable() {
                 @Override
                 public void run() {
-                    logger.debug("Property changed: '" + getName() + " = " + getValue() + "'");
+                    logger.debug("Property changed: '{} = {}'", getName(), getValue());
                     checkAndFlip();
                 }
             });

diff --git a/...c/main/java/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedProperty.java b/...c/main/java/com/netflix/hystrix/strategy/properties/HystrixPropertiesChainedProperty.java
@@ -87,10 +87,10 @@ protected void checkAndFlip() {
             }
 
             if (this.isValueAcceptable()) {
-                logger.debug("Flipping property: " + getName() + " to use it's current value:" + getValue());
+                logger.debug("Flipping property: {} to use it's current value: {}", getName(), getValue());
                 pReference.set(this);
             } else {
-                logger.debug("Flipping property: " + getName() + " to use NEXT property: " + next);
+                logger.debug("Flipping property: {} to use NEXT property: {}", getName(), next);
                 pReference.set(next);
             }
 
@@ -233,7 +233,7 @@ public ChainProperty(HystrixDynamicProperty<T> sProperty, ChainProperty<T> next)
             sProp.addCallback(new Runnable() {
                 @Override
                 public void run() {
-                    logger.debug("Property changed: '" + getName() + " = " + getValue() + "'");
+                    logger.debug("Property changed: '{} = {}'", getName(), getValue());
                     checkAndFlip();
                 }
             });

diff --git a/hystrix-dashboard/src/main/java/com/netflix/hystrix/dashboard/stream/ProxyStreamServlet.java b/hystrix-dashboard/src/main/java/com/netflix/hystrix/dashboard/stream/ProxyStreamServlet.java
@@ -90,7 +90,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) t
             }
         }
         String proxyUrl = url.toString();
-        logger.info("\n\nProxy opening connection to: " + proxyUrl + "\n\n");
+        logger.info("\n\nProxy opening connection to: {}\n\n", proxyUrl);
         try {
             httpget = new HttpGet(proxyUrl);
             if (authorization != null) {