From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Mon, 5 Dec 2016 22:53:49 +0000 (-0500)
Subject: pimd: Cleanup debugs for pim_upstream_sg_running
X-Git-Tag: frr-3.0-branchpoint~64^2~10^2~31
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=eeedae06ee5c13d225b3fbf2f01bf410846ead2f;p=mirror%2Ffrr.git

pimd: Cleanup debugs for pim_upstream_sg_running

In the normal case when we have debugs turned on and the
stream is not running, only display one line of output
instead of 2.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 2daa91080a..90adf60615 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -1447,9 +1447,11 @@ pim_upstream_sg_running (void *arg)
     {
       if (PIM_DEBUG_TRACE)
 	{
-	  zlog_debug ("%s: %s old packet count is equal or lastused is greater than 30",
-		      __PRETTY_FUNCTION__, up->sg_str);
-	  zlog_debug ("%s: %ld %ld %lld", __PRETTY_FUNCTION__, up->channel_oil->cc.oldpktcnt, up->channel_oil->cc.pktcnt, up->channel_oil->cc.lastused/100);
+	  zlog_debug ("%s: %s old packet count is equal or lastused is greater than 30, (%ld,%ld,%lld)",
+		      __PRETTY_FUNCTION__, up->sg_str,
+		      up->channel_oil->cc.oldpktcnt,
+		      up->channel_oil->cc.pktcnt,
+		      up->channel_oil->cc.lastused/100);
 	}
       return;
     }