Clean up logging

[netvirt.git] / openstack / net-virt / src / main / java / org / opendaylight / ovsdb / openstack / netvirt / PortHandler.java

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
index 2ecf1090b851d1caa658a4a93852a6d7fb32498a..cb9b9cfe9cb2f8d764099610c494c31887ed03c6 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/PortHandler.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
  * Handle requests for Neutron Port.
  */
 public class PortHandler extends AbstractHandler implements INeutronPortAware, ConfigInterface {
-    static final Logger logger = LoggerFactory.getLogger(PortHandler.class);
+    private static final Logger LOG = LoggerFactory.getLogger(PortHandler.class);
 
     // The implementation for each of these services is resolved by the OSGi Service Manager
     private volatile NodeCacheManager nodeCacheManager;
@@ -61,8 +61,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
         enqueueEvent(new NorthboundEvent(neutronPort, Action.ADD));
     }
     private void doNeutronPortCreated(NeutronPort neutronPort) {
-        logger.debug(" Port-ADD successful for tenant-id - {}," +
-                     " network-id - {}, port-id - {}",
+        LOG.debug(" Port-ADD successful for tenant-id - {}, network-id - {}, port-id - {}",
                      neutronPort.getTenantID(), neutronPort.getNetworkUUID(),
                      neutronPort.getID());
         neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.ADD);
@@ -94,7 +93,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
         enqueueEvent(new NorthboundEvent(neutronPort, Action.UPDATE));
     }
     private void doNeutronPortUpdated(NeutronPort neutronPort) {
-        logger.debug("Handling neutron update port " + neutronPort);
+        LOG.debug("Handling neutron update port {}", neutronPort);
         neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.UPDATE);
     }
 
@@ -120,7 +119,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
         enqueueEvent(new NorthboundEvent(neutronPort, Action.DELETE));
     }
     private void doNeutronPortDeleted(NeutronPort neutronPort) {
-        logger.debug("Handling neutron delete port " + neutronPort);
+        LOG.debug("Handling neutron delete port {}", neutronPort);
         neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.DELETE);
         //TODO: Need to implement getNodes
         List<Node> nodes = nodeCacheManager.getNodes();
@@ -131,17 +130,16 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
                     String neutronPortId =
                             southbound.getInterfaceExternalIdsValue(port, Constants.EXTERNAL_ID_INTERFACE_ID);
                     if (neutronPortId != null && neutronPortId.equalsIgnoreCase(neutronPort.getPortUUID())) {
-                        logger.trace("neutronPortDeleted: Delete interface {}", port.getName());
+                        LOG.trace("neutronPortDeleted: Delete interface {}", port.getName());
                         southbound.deleteTerminationPoint(node, port.getName());
                         break;
                     }
                 }
             } catch (Exception e) {
-                logger.error("Exception during handlingNeutron port delete", e);
+                LOG.error("Exception during handlingNeutron port delete", e);
             }
         }
-        logger.debug(" PORT delete successful for tenant-id - {}, " +
-                     " network-id - {}, port-id - {}",
+        LOG.debug(" PORT delete successful for tenant-id - {}, network-id - {}, port-id - {}",
                      neutronPort.getTenantID(), neutronPort.getNetworkUUID(),
                      neutronPort.getID());
     }
@@ -155,7 +153,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
     @Override
     public void processEvent(AbstractEvent abstractEvent) {
         if (!(abstractEvent instanceof NorthboundEvent)) {
-            logger.error("Unable to process abstract event " + abstractEvent);
+            LOG.error("Unable to process abstract event {}", abstractEvent);
             return;
         }
         NorthboundEvent ev = (NorthboundEvent) abstractEvent;
@@ -170,7 +168,7 @@ public class PortHandler extends AbstractHandler implements INeutronPortAware, C
                 doNeutronPortUpdated(ev.getPort());
                 break;
             default:
-                logger.warn("Unable to process event action " + ev.getAction());
+                LOG.warn("Unable to process event action {}", ev.getAction());
                 break;
         }
     }