- Plugin sends Barrier msg every 100 async msgs (configurable thru config.ini: of...

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / internal / TopologyServiceShim.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
index 6fda92c02305038855e91c6280d4524edabb00a7..424af8d4f445e2e7b214e7533b2141c211dde2d7 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServiceShim.java
@@ -9,7 +9,6 @@
 package org.opendaylight.controller.protocol_plugin.openflow.internal;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -104,7 +103,7 @@ public class TopologyServiceShim implements IDiscoveryService,
 
                     entry = null;
                 } catch (InterruptedException e1) {
-                    logger.warn("TopologyNotify interrupted", e1.getMessage());
+                    logger.warn("TopologyNotify interrupted {}", e1.getMessage());
                     if (shuttingDown) {
                         return;
                     }
@@ -156,7 +155,7 @@ public class TopologyServiceShim implements IDiscoveryService,
                     }
                 } catch (InterruptedException e1) {
                     logger.warn(
-                            "Edge Bandwidth Utilization Notify Thread interrupted",
+                            "Edge Bandwidth Utilization Notify Thread interrupted {}",
                             e1.getMessage());
                     if (shuttingDown) {
                         return;
@@ -329,8 +328,8 @@ public class TopologyServiceShim implements IDiscoveryService,
                 && !this.topologyServiceShimListeners
                         .containsKey(containerName)) {
             this.topologyServiceShimListeners.put(containerName, s);
-            logger.trace("Added topologyServiceShimListener for container:"
-                    + containerName);
+            logger.trace("Added topologyServiceShimListener for container: {}",
+                    containerName);
         }
     }
 
@@ -350,8 +349,8 @@ public class TopologyServiceShim implements IDiscoveryService,
                 && this.topologyServiceShimListeners.get(containerName).equals(
                         s)) {
             this.topologyServiceShimListeners.remove(containerName);
-            logger.trace("Removed topologyServiceShimListener for container: "
-                    + containerName);
+            logger.trace("Removed topologyServiceShimListener for container: {}",
+                    containerName);
         }
     }
 
@@ -423,14 +422,15 @@ public class TopologyServiceShim implements IDiscoveryService,
             }
             break;
         default:
-            logger.debug("Invalid " + type + " Edge " + edge
-                    + " in container {}", container);
+            logger.debug("notifyEdge: invalid {} for Edge {} in container {}",
+                    type, edge, container);
             return;
         }
 
         notifyQ.add(new NotifyEntry(container, edgeProps, type));
 
-        logger.trace(type + " Edge " + edge + " in container {}", container);
+        logger.debug("notifyEdge: {} Edge {} in container {}",
+                type, edge, container);
     }
 
     @Override