From 274cecbb098119cb764e396324d409840eafd57a Mon Sep 17 00:00:00 2001
From: Jon Hall <jhall@ciena.com>
Date: Wed, 9 Aug 2017 12:15:48 -0700
Subject: [PATCH] Clarify and add more details to some log messages

Change-Id: I3b9df11748e41e857ed0bc3e166d1434743902de
---
 .../java/org/onosproject/net/flow/impl/FlowRuleManager.java    | 3 ++-
 .../java/org/onosproject/net/intent/impl/IntentManager.java    | 2 +-
 .../java/org/onosproject/net/intent/impl/ObjectiveTracker.java | 2 +-
 .../org/onosproject/provider/lldpcommon/LinkDiscovery.java     | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
index 935713810e..a2c02993c5 100644
--- a/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onosproject/net/flow/impl/FlowRuleManager.java
@@ -534,7 +534,8 @@ public class FlowRuleManager
                         }
                     }
                 } catch (Exception e) {
-                    log.warn("Can't process added or extra rule {}", e);
+                    log.warn("Can't process added or extra rule {} for device {}:{}",
+                             rule, deviceId, e);
                 }
             }
 
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
index 770c3d9216..f694deee12 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/IntentManager.java
@@ -496,7 +496,7 @@ public class IntentManager
         public void triggerCompile(Iterable<Key> intentKeys,
                                    boolean compileAllFailed) {
             // TODO figure out who is making excessive calls?
-            log.trace("submitting {} + all?:{}", intentKeys, compileAllFailed);
+            log.trace("submitting {} + all?:{} for compilation", intentKeys, compileAllFailed);
             buildAndSubmitBatches(intentKeys, compileAllFailed);
         }
     }
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
index 285e68afa6..f94fd6f57c 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/ObjectiveTracker.java
@@ -422,7 +422,7 @@ public class ObjectiveTracker implements ObjectiveTrackerService {
     private final class InternalPartitionListener implements WorkPartitionEventListener {
         @Override
         public void event(WorkPartitionEvent event) {
-            log.debug("got message {}", event.subject());
+            log.debug("got message {}:{}", event.type(), event.subject());
             scheduleIntentUpdate(1);
         }
     }
diff --git a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
index ea8a80d8ca..671e6d069f 100644
--- a/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
+++ b/providers/lldpcommon/src/main/java/org/onosproject/provider/lldpcommon/LinkDiscovery.java
@@ -265,7 +265,7 @@ public class LinkDiscovery implements TimerTask {
         if (context.packetService() == null) {
             return;
         }
-        log.trace("Sending probes out to {}@{}", portNumber, device.id());
+        log.trace("Sending probes out of {}@{}", portNumber, device.id());
         OutboundPacket pkt = createOutBoundLldp(portNumber);
         context.packetService().emit(pkt);
         if (context.useBddp()) {