From: Alessandro Boch Date: Wed, 24 Apr 2013 00:31:27 +0000 (+0000) Subject: Merge "Fixing ForwardingRulesManager code that got lost in a previous merge" X-Git-Tag: releasepom-0.1.0~538 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=c62c3615c0812460a8880f7ff0a1d3f6be548952;hp=96cea2cdebe2c4d31200b9c187e86af81b66af25 Merge "Fixing ForwardingRulesManager code that got lost in a previous merge" --- diff --git a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java index d4c1fd3045..3730a71f1e 100644 --- a/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java +++ b/opendaylight/arphandler/src/main/java/org/opendaylight/controller/arphandler/internal/ArpHandler.java @@ -130,9 +130,11 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { protected void handleARPPacket(Ethernet eHeader, ARP pkt, NodeConnector p) { if (pkt.getOpCode() == 0x1) { - logger.debug("Received ARP REQUEST Packet from NodeConnector:" + p); + logger.debug("Received ARP REQUEST Packet from NodeConnector: {}", + p); } else { - logger.debug("Received ARP REPLY Packet from NodeConnector:" + p); + logger.debug("Received ARP REPLY Packet from NodeConnector: {}", + p); } InetAddress targetIP = null; try { @@ -328,13 +330,13 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { Node n = host.getnodeconnectorNode(); if (n == null) { logger.error("cannot send UcastARP because cannot extract node " - + "from HostNodeConnector:" + host); + + "from HostNodeConnector: {}", host); return; } NodeConnector outPort = host.getnodeConnector(); if (outPort == null) { logger.error("cannot send UcastARP because cannot extract " - + "outPort from HostNodeConnector:" + host); + + "outPort from HostNodeConnector: {}", host); return; } @@ -489,8 +491,8 @@ public class ArpHandler implements IHostFinder, IListenDataPacket { return PacketResult.IGNORED; } logger - .trace("Received a frame of size:" - + inPkt.getPacketData().length); + .trace("Received a frame of size: {}", + inPkt.getPacketData().length); Packet formattedPak = this.dataPacketService.decodeDataPacket(inPkt); if (formattedPak instanceof Ethernet) { Object nextPak = formattedPak.getPayload(); diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java index 476b1b12f5..3034d3ca6d 100644 --- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java +++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManager.java @@ -113,15 +113,15 @@ public class ClusterManager implements IClusterServices { } while (supernodes.hasMoreTokens()) { String curr_supernode = supernodes.nextToken(); - logger.debug("Examining supernode " + curr_supernode); + logger.debug("Examining supernode {}", curr_supernode); StringTokenizer host_port = new StringTokenizer(curr_supernode, "[]"); String host; String port; Integer port_num = gossipRouterPortDefault; if (host_port.countTokens() > 2) { - logger.error("Error parsing supernode " + curr_supernode - + " proceed to the next one"); + logger.error("Error parsing supernode {} proceed to the next one", + curr_supernode); continue; } host = host_port.nextToken(); @@ -184,13 +184,13 @@ public class ClusterManager implements IClusterServices { for (InetAddress myAddr : myAddresses) { if (myAddr.isLoopbackAddress() || myAddr.isLinkLocalAddress()) { - logger.debug("Skipping local address " - + myAddr.getHostAddress()); + logger.debug("Skipping local address {}", + myAddr.getHostAddress()); continue; } else { // First non-local address myBind = myAddr.getHostAddress(); - logger.debug("First non-local address " + myBind); + logger.debug("First non-local address {}", myBind); break; } } @@ -199,7 +199,7 @@ public class ClusterManager implements IClusterServices { .getProperty("jgroups.tcp.address"); if (jgroupAddress == null) { if (myBind != null) { - logger.debug("Set bind address to be " + myBind); + logger.debug("Set bind address to be {}", myBind); System.setProperty("jgroups.tcp.address", myBind); } else { logger @@ -207,8 +207,8 @@ public class ClusterManager implements IClusterServices { System.setProperty("jgroups.tcp.address", "127.0.0.1"); } } else { - logger.debug("jgroup.tcp.address already set to be " - + jgroupAddress); + logger.debug("jgroup.tcp.address already set to be {}", + jgroupAddress); } } catch (UnknownHostException uhe) { logger @@ -220,14 +220,14 @@ public class ClusterManager implements IClusterServices { // host list System.setProperty("jgroups.tcpgossip.initial_hosts", sanitized_supernodes_list.toString()); - logger.debug("jgroups.tcp.address set to " - + System.getProperty("jgroups.tcp.address")); - logger.debug("jgroups.tcpgossip.initial_hosts set to " - + System.getProperty("jgroups.tcpgossip.initial_hosts")); + logger.debug("jgroups.tcp.address set to {}", + System.getProperty("jgroups.tcp.address")); + logger.debug("jgroups.tcpgossip.initial_hosts set to {}", + System.getProperty("jgroups.tcpgossip.initial_hosts")); GossipRouter res = null; if (amIGossipRouter) { - logger.info("I'm a GossipRouter will listen on port " - + gossipRouterPort); + logger.info("I'm a GossipRouter will listen on port {}", + gossipRouterPort); res = new GossipRouter(gossipRouterPort); } return res; @@ -241,10 +241,8 @@ public class ClusterManager implements IClusterServices { this.gossiper.start(); logger.info("Started GossipRouter"); } catch (Exception e) { - logger.error("GossipRouter didn't start exception " + e - + " met"); - logger.error("Stack Trace that raised the exception"); - logger.error("",e); + logger.error("GossipRouter didn't start. Exception Stack Trace", + e); } } logger.info("Starting the ClusterManager"); @@ -264,7 +262,7 @@ public class ClusterManager implements IClusterServices { this.cm = null; this.stop(); } - logger.debug("Cache Manager has value " + this.cm); + logger.debug("Cache Manager has value {}", this.cm); } public void stop() { diff --git a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java index 2afbabe87f..7bf495426f 100644 --- a/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java +++ b/opendaylight/clustering/services_implementation/src/main/java/org/opendaylight/controller/clustering/services_implementation/internal/ClusterManagerCommon.java @@ -116,7 +116,7 @@ abstract public class ClusterManagerCommon implements IClusterServicesCommon { Dictionary props = c.getServiceProperties(); if (props != null) { this.containerName = (String) props.get("containerName"); - logger.debug("Running containerName:" + this.containerName); + logger.debug("Running containerName: {}", this.containerName); } else { // In the Global instance case the containerName is empty this.containerName = ""; diff --git a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java index 6fa0d6e96e..035b0d3433 100644 --- a/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java +++ b/opendaylight/clustering/stub/src/main/java/org/opendaylight/controller/clustering/stub/internal/ClusterManagerCommon.java @@ -65,7 +65,7 @@ abstract public class ClusterManagerCommon implements IClusterServicesCommon { Dictionary props = c.getServiceProperties(); if (props != null) { this.containerName = (String) props.get("containerName"); - logger.debug("Running containerName:" + this.containerName); + logger.debug("Running containerName: {}", this.containerName); } else { // In the Global instance case the containerName is empty this.containerName = ""; diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImpl.java b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImpl.java index efe966b719..3d0c5659d6 100644 --- a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImpl.java +++ b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationContainerImpl.java @@ -83,14 +83,14 @@ public class ConfigurationContainerImpl implements public Status saveConfiguration() { boolean success = true; for (IConfigurationContainerAware configurationAware : configurationAwareList) { - logger.info("Save Config triggered for " - + configurationAware.getClass().getSimpleName()); + logger.info("Save Config triggered for {}", + configurationAware.getClass().getSimpleName()); Status status = configurationAware.saveConfiguration(); if (!status.isSuccess()) { success = false; - logger.info("Failed to save config for " - + configurationAware.getClass().getSimpleName()); + logger.info("Failed to save config for {}", + configurationAware.getClass().getSimpleName()); } } if (success) { diff --git a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationImpl.java b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationImpl.java index a8f7da69a0..ee15b4a9c2 100644 --- a/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationImpl.java +++ b/opendaylight/configuration/implementation/src/main/java/org/opendaylight/controller/configuration/internal/ConfigurationImpl.java @@ -84,8 +84,8 @@ public class ConfigurationImpl implements IConfigurationService { Status status = configurationAware.saveConfiguration(); if (!status.isSuccess()) { success = false; - logger.info("Failed to save config for " - + configurationAware.getClass().getName()); + logger.info("Failed to save config for {}", + configurationAware.getClass().getName()); } } if (success) { diff --git a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java index 4c2ea7313a..ad6ea6bc10 100644 --- a/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java +++ b/opendaylight/forwarding/staticrouting/src/main/java/org/opendaylight/controller/forwarding/staticrouting/internal/StaticRoutingImplementation.java @@ -451,8 +451,8 @@ public class StaticRoutingImplementation implements IfNewHostNotify, staticRoutesFileName = ROOT + "staticRouting_" + containerName + ".conf"; - log.debug("forwarding.staticrouting starting on container " - + containerName); + log.debug("forwarding.staticrouting starting on container {}", + containerName); //staticRoutes = new ConcurrentHashMap(); allocateCaches(); retrieveCaches(); diff --git a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java index 42802d324c..45f3cedacb 100644 --- a/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java +++ b/opendaylight/hosttracker/src/main/java/org/opendaylight/controller/hosttracker/HostTracker.java @@ -639,7 +639,6 @@ public class HostTracker implements IfIptoHost, IfHostListener, if (switchNeedsTieringUpdate(dstNode, currentTier + 1)) { Tier t = new Tier(currentTier + 1); switchManager.setNodeProp(dstNode, t); - //logger.info("Updating Switch Tier "+ (currentTier+1) +" for "+String.format("%x", dstSw.getId())); needsVisiting.add(dstNode); } } @@ -684,7 +683,6 @@ public class HostTracker implements IfIptoHost, IfHostListener, return true; else if (t.getValue() > tier) return true; - //logger.info(getContainerName()+" -> "+ "Switch "+String.format("%x", sw.getId())+ " is in better Tier "+sw.getTier()+" ... skipping "+tier); return false; } @@ -993,8 +991,6 @@ public class HostTracker implements IfIptoHost, IfHostListener, notifyHostLearnedOrRemoved(host, false); } else if (arp_cntdown <= switchManager.getHostRetryCount()) { /* Use the services of arphandler to check if host is still there */ - // logger.info("Probe for Host:{}", host); - //logger.info("ARP Probing ("+arp_cntdown+") for "+host.toString()); logger.trace("ARP Probing ({}) for {}({})", new Object[] { arp_cntdown, host.getNetworkAddress().getHostAddress(), diff --git a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java index 75c5ca9cbb..d455a0ae20 100644 --- a/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java +++ b/opendaylight/logging/bridge/src/main/java/org/opendaylight/controller/logging/bridge/internal/Activator.java @@ -44,7 +44,7 @@ public class Activator implements BundleActivator { .getService(service); if (reader == null) { this.log.error("Cannot register the LogListener because " - + "cannot retrive LogReaderService"); + + "cannot retrieve LogReaderService"); } reader.addLogListener(this.listener); // Now lets walk all the exiting messages @@ -66,7 +66,7 @@ public class Activator implements BundleActivator { controller.logging.bridge.internal.UncaughtExceptionHandler()); } else { this.log.error("Cannot register the LogListener because " - + "cannot retrive LogReaderService"); + + "cannot retrieve LogReaderService"); } } else { System.err diff --git a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java index 0555860696..ef9f2f4bad 100644 --- a/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java +++ b/opendaylight/sal/api/src/main/java/org/opendaylight/controller/sal/utils/ServiceHelper.java @@ -82,7 +82,8 @@ public class ServiceHelper { } return true; } catch (Exception e) { - logger.error("Exception "+e.getMessage() +" while registering the service "+instance.toString()); + logger.error("Exception {} while registering the service {}", + e.getMessage(), instance.toString()); } return false; } diff --git a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java index 1b9c749163..0397cd4c47 100644 --- a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java +++ b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/internal/UserManagerImpl.java @@ -275,14 +275,14 @@ public class UserManagerImpl implements IUserManager, IObjectReader, break; } else if (rcResponse.getStatus() == AuthResultEnum.AUTH_REJECT) { logger.info( - "Remote Authentication Rejected User: \"{}\", from Server: {}, Reason: " - + rcResponse.getStatus().toString(), - userName, aaaServer.getAddress()); + "Remote Authentication Rejected User: \"{}\", from Server: {}, Reason:{}", + new Object[] {userName, aaaServer.getAddress(), + rcResponse.getStatus().toString()}); } else { logger.info( - "Remote Authentication Failed for User: \"{}\", from Server: {}, Reason: " - + rcResponse.getStatus().toString(), - userName, aaaServer.getAddress()); + "Remote Authentication Failed for User: \"{}\", from Server: {}, Reason:{}", + new Object[] {userName, aaaServer.getAddress(), + rcResponse.getStatus().toString()}); } } } @@ -367,8 +367,8 @@ public class UserManagerImpl implements IUserManager, IObjectReader, */ putUserInActiveList(userName, result); if (authorized) { - logger.info("User \"{}\" authorized for the following role(s): " - + result.getUserRoles(), userName); + logger.info("User \"{}\" authorized for the following role(s): {}", + userName, result.getUserRoles()); } else { logger.info("User \"{}\" Not Authorized for any role ", userName); } diff --git a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java index 7706fe2b1a..21d0137849 100644 --- a/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java +++ b/opendaylight/usermanager/src/main/java/org/opendaylight/controller/usermanager/security/SessionManager.java @@ -38,8 +38,9 @@ public class SessionManager implements ISessionManager { ServletContext ctx = se.getSession().getServletContext(); String path = ctx.getContextPath(); - logger.debug("Servlet Context Path created " + path); - logger.debug("Session Id created for ctxt path " + se.getSession().getId()); + logger.debug("Servlet Context Path created {}", path); + logger.debug("Session Id created for ctxt path {}", + se.getSession().getId()); synchronized (sessionMap) { Set set = sessionMap.get(ctx); @@ -55,8 +56,8 @@ public class SessionManager implements ISessionManager { public void sessionDestroyed(HttpSessionEvent se) { ServletContext ctx = se.getSession().getServletContext(); String path = ctx.getContextPath(); - logger.debug("Servlet Context Path of destroyed session - " + path); - logger.debug("Session Id destroyed " + se.getSession().getId()); + logger.debug("Servlet Context Path of destroyed session - {}", path); + logger.debug("Session Id destroyed {}", se.getSession().getId()); synchronized (sessionMap) { Set set = sessionMap.get(ctx);