Fix logging mismatches

Throwables should not be formatted, fix that. Also rework
logging for null tunnels.

Change-Id: I1dbf1b3ce79bbb32b5dbc65b125b405910f7dc88
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java
index 565ecb66a2e27827967a0688d5d44de5a198cfea..af0d3e9b38e7ed17d2acb4ef3ec17c7b2310bdfe 100644 (file)
--- a/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java
+++ b/bgp/extensions/mvpn/src/main/java/org/opendaylight/protocol/bgp/mvpn/spi/pojo/attributes/tunnel/identifier/SimpleTunnelIdentifierRegistry.java
@@ -42,7 +42,7 @@ public final class SimpleTunnelIdentifierRegistry {
 
     public int serialize(final TunnelIdentifier tunnel, final ByteBuf tunnelBuffer) {
         if (tunnel == null) {
-            LOG.debug("Skipping serialization of PMSI Tunnel Attribute {}");
+            LOG.debug("Skipping serialization of null PMSI Tunnel Attribute");
             return NO_TUNNEL_INFORMATION_PRESENT;
         }
         final TunnelIdentifierSerializer serializer = this.handlers.getSerializer(tunnel.getImplementedInterface());

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BGPClusterSingletonService.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BGPClusterSingletonService.java
index 5381ce097e103416a36830b97c656413c6d70560..5b892d75ea424b9683cc48109fe70a5a5cd8945e 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BGPClusterSingletonService.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/config/BGPClusterSingletonService.java
@@ -139,7 +139,7 @@ public final class BGPClusterSingletonService implements ClusterSingletonService
 
             @Override
             public void onFailure(final Throwable throwable) {
-                LOG.warn("Failed removing peers {}", throwable);
+                LOG.warn("Failed removing peers", throwable);
             }
         }, MoreExecutors.directExecutor());
         return done;

diff --git a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java
index 1797f287daaa3f68f9b27ef1476d1d53912d6fe8..b9a07abcbe8742474e65f975bd325bc482eea480 100755 (executable)
--- a/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java
+++ b/pcep/pcc-mock/src/main/java/org/opendaylight/protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java
@@ -96,7 +96,8 @@ final class PCCReconnectPromise extends DefaultPromise<PCEPSession> {
             synchronized (this.lock) {
                 if (PCCReconnectPromise.this.isCancelled()) {
                     if (cf.isSuccess()) {
-                        PCCReconnectPromise.LOG.debug("Closing channels for cancelled promise {}");
+                        PCCReconnectPromise.LOG.debug("Closing channels for cancelled promise {}",
+                                PCCReconnectPromise.this);
                         cf.channel().close();
                     }
                 } else if (cf.isSuccess()) {