From 8e8340cc80c332f504c14c2704385f635749b841 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 5 Apr 2019 00:23:19 +0200 Subject: [PATCH] Fix logging mismatches Throwables should not be formatted, fix that. Also rework logging for null tunnels. Change-Id: I1dbf1b3ce79bbb32b5dbc65b125b405910f7dc88 Signed-off-by: Robert Varga --- .../tunnel/identifier/SimpleTunnelIdentifierRegistry.java | 2 +- .../bgp/rib/impl/config/BGPClusterSingletonService.java | 2 +- .../protocol/pcep/pcc/mock/protocol/PCCReconnectPromise.java | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) 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 565ecb66a2..af0d3e9b38 100644 --- 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 5381ce097e..5b892d75ea 100644 --- 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 1797f287da..b9a07abcbe 100755 --- 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 { 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()) { -- 2.36.6