diff --git a/src/main/java/net/floodlightcontroller/core/internal/Controller.java b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
index a4aae3e2e905f5e014a129ab5c04f9dd382756f7..a33f1410419c5c9b9fe7cc6a9c977a8f0768c4a9 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/Controller.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/Controller.java
@@ -249,8 +249,8 @@ public class Controller implements IFloodlightProviderService,
this.added = added;
}
public void dispatch() {
- if (log.isDebugEnabled()) {
- log.debug("Dispatching switch update {} {}",
+ if (log.isTraceEnabled()) {
+ log.trace("Dispatching switch update {} {}",
sw, added);
}
if (switchListeners != null) {
@@ -275,8 +275,8 @@ public class Controller implements IFloodlightProviderService,
this.newRole = newRole;
}
public void dispatch() {
- if (log.isDebugEnabled()) {
- log.debug("Dispatching HA Role update newRole = {}, oldRole = {}",
+ if (log.isTraceEnabled()) {
+ log.trace("Dispatching HA Role update newRole = {}, oldRole = {}",
newRole, oldRole);
}
if (haListeners != null) {
@@ -304,8 +304,8 @@ public class Controller implements IFloodlightProviderService,
this.removedControllerNodeIPs = removedControllerNodeIPs;
}
public void dispatch() {
- if (log.isDebugEnabled()) {
- log.debug("Dispatching HA Controller Node IP update "
+ if (log.isTraceEnabled()) {
+ log.trace("Dispatching HA Controller Node IP update "
+ "curIPs = {}, addedIPs = {}, removedIPs = {}",
new Object[] { curControllerNodeIPs, addedControllerNodeIPs,
removedControllerNodeIPs }
@@ -811,8 +811,8 @@ public class Controller implements IFloodlightProviderService,
switch (m.getType()) {
case HELLO:
- if (log.isDebugEnabled())
- log.debug("HELLO from {}", sw);
+ if (log.isTraceEnabled())
+ log.trace("HELLO from {}", sw);
if (state.hsState.equals(HandshakeState.START)) {
state.hsState = HandshakeState.HELLO;
@@ -831,8 +831,8 @@ public class Controller implements IFloodlightProviderService,
case ECHO_REPLY:
break;
case FEATURES_REPLY:
- if (log.isDebugEnabled())
- log.debug("Features Reply from {}", sw);
+ if (log.isTraceEnabled())
+ log.trace("Features Reply from {}", sw);
if (state.hsState.equals(HandshakeState.HELLO)) {
sw.setFeaturesReply((OFFeaturesReply) m);
@@ -847,8 +847,8 @@ public class Controller implements IFloodlightProviderService,
}
break;
case GET_CONFIG_REPLY:
- if (log.isDebugEnabled())
- log.debug("Get config reply from {}", sw);
+ if (log.isTraceEnabled())
+ log.trace("Get config reply from {}", sw);
if (!state.hsState.equals(HandshakeState.FEATURES_REPLY)) {
String em = "Unexpected GET_CONFIG_REPLY from " + sw;
@@ -856,7 +856,7 @@ public class Controller implements IFloodlightProviderService,
}
OFGetConfigReply cr = (OFGetConfigReply) m;
if (cr.getMissSendLength() == (short)0xffff) {
- log.debug("Config Reply from {} confirms " +
+ log.trace("Config Reply from {} confirms " +
"miss length set to 0xffff", sw);
} else {
log.warn("Config Reply from {} has " +
@@ -1795,17 +1795,17 @@ public class Controller implements IFloodlightProviderService,
if (ofPort != null) {
this.openFlowPort = Integer.parseInt(ofPort);
}
- log.info("OpenFlow port set to {}", this.openFlowPort);
+ log.debug("OpenFlow port set to {}", this.openFlowPort);
String threads = configParams.get("workerthreads");
if (threads != null) {
this.workerThreads = Integer.parseInt(threads);
}
- log.info("Number of worker threads set to {}", this.workerThreads);
+ log.debug("Number of worker threads set to {}", this.workerThreads);
String controllerId = configParams.get("controllerid");
if (controllerId != null) {
this.controllerId = controllerId;
}
- log.info("ControllerId set to {}", this.controllerId);
+ log.debug("ControllerId set to {}", this.controllerId);
}
private void initVendorMessages() {
@@ -1855,7 +1855,6 @@ public class Controller implements IFloodlightProviderService,
* Startup all of the controller's components
*/
public void startupComponents() {
- log.debug("Doing controller internal setup");
// Create the table names we use
storageSource.createTable(CONTROLLER_TABLE_NAME, null);
storageSource.createTable(SWITCH_TABLE_NAME, null);
@@ -1884,7 +1883,6 @@ public class Controller implements IFloodlightProviderService,
}
}
}
- log.info("Connected to storage source");
// Add our REST API
restApi.addRestletRoutable(new CoreWebRoutable());
diff --git a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
index 1a79dfce5e732cbe69688822c34fc21201c6a429..673790748e4232cc002b6156364b54f9d738d04f 100644
--- a/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
+++ b/src/main/java/net/floodlightcontroller/core/internal/RoleChanger.java
@@ -160,7 +160,7 @@ public class RoleChanger {
public void run() {
RoleChangeTask t;
boolean interrupted = false;
- log.debug("RoleRequestWorker thread started");
+ log.trace("RoleRequestWorker thread started");
try {
while (true) {
try {
diff --git a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
index e71692b4f73bfbe5f4cf14982aa780d993811d58..ec443e2076057ee754182dfa8bdff12bfe47d993 100644
--- a/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
+++ b/src/main/java/net/floodlightcontroller/core/module/FloodlightModuleLoader.java
@@ -76,8 +76,8 @@ public class FloodlightModuleLoader {
= ServiceLoader.load(IFloodlightModule.class, cl);
// Iterate for each module, iterate through and add it's services
for (IFloodlightModule m : moduleLoader) {
- if (logger.isDebugEnabled()) {
- logger.debug("Found module " + m.getClass().getName());
+ if (logger.isTraceEnabled()) {
+ logger.trace("Found module " + m.getClass().getName());
}
// Set up moduleNameMap
@@ -169,7 +169,7 @@ public class FloodlightModuleLoader {
*/
public IFloodlightModuleContext loadModulesFromList(Collection<String> configMods, Properties prop)
throws FloodlightModuleException {
- logger.debug("Starting module loader");
+ logger.trace("Starting module loader");
findAllModules(configMods);
Collection<IFloodlightModule> moduleSet = new ArrayList<IFloodlightModule>();
diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index d5d53e5a9e502a46227a8c08462673cb0b92dfd5..e23b5fd64347addb1ba787d5d8adb00f7ff2cf14 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -533,11 +533,11 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
// Find the device matching the destination from the entity
// classes of the source.
Entity dstEntity = getEntityFromFlowMod(ofm.ofmWithSwDpid, false);
- logger.debug("DeviceManager dstEntity {}", dstEntity);
+ logger.trace("DeviceManager dstEntity {}", dstEntity);
if (dstEntity != null) {
Device dstDevice =
findDestByEntity(srcDevice, dstEntity);
- logger.debug("DeviceManager dstDevice {}", dstDevice);
+ logger.trace("DeviceManager dstDevice {}", dstDevice);
if (dstDevice != null)
fcStore.put(ofm.cntx, CONTEXT_DST_DEVICE, dstDevice);
}
@@ -1025,8 +1025,8 @@ IFlowReconcileListener, IInfoProvider, IHAListener {
deviceKey = Long.valueOf(deviceKeyCounter++);
}
device = allocateDevice(deviceKey, entity, entityClass);
- if (logger.isDebugEnabled()) {
- logger.debug("New device created: {} deviceKey={}",
+ if (logger.isTraceEnabled()) {
+ logger.trace("New device created: {} deviceKey={}",
device, deviceKey);
}
diff --git a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
index e48f3adcc306fd89d111af90da8f6ff9352c1b84..9d738ead7df24f8f919b47b1a1c34f883ab89732 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/FlowReconcileManager.java
@@ -38,14 +38,14 @@ public class FlowReconcileManager
public synchronized void addFlowReconcileListener(IFlowReconcileListener listener) {
flowReconcileListeners.addListener(OFType.FLOW_MOD, listener);
- if (logger.isDebugEnabled()) {
+ if (logger.isTraceEnabled()) {
StringBuffer sb = new StringBuffer();
- sb.append("FlowReconcileManager FlowMod Listeners: ");
+ sb.append("FlowMod listeners: ");
for (IFlowReconcileListener l : flowReconcileListeners.getOrderedListeners()) {
sb.append(l.getName());
sb.append(",");
}
- logger.debug(sb.toString());
+ logger.trace(sb.toString());
}
}
@@ -66,7 +66,7 @@ public class FlowReconcileManager
*/
public void reconcileFlow(OFMatchReconcile ofmRcIn) {
if (logger.isTraceEnabled()) {
- logger.trace("Reconciliating flow: {}", ofmRcIn.toString());
+ logger.trace("Reconciling flow: {}", ofmRcIn.toString());
}
ArrayList<OFMatchReconcile> ofmRcList =
new ArrayList<OFMatchReconcile>();
@@ -75,7 +75,7 @@ public class FlowReconcileManager
IFlowReconcileListener.Command retCmd;
for (IFlowReconcileListener flowReconciler : flowReconcileListeners.getOrderedListeners()) {
if (logger.isTraceEnabled()) {
- logger.trace("Reconciliatng flow: call listener {}", flowReconciler.getName());
+ logger.trace("Reconciling flow: call listener {}", flowReconciler.getName());
}
retCmd = flowReconciler.reconcileFlows(ofmRcList);
if (retCmd == IFlowReconcileListener.Command.STOP) {
diff --git a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
index 24f069023c8fb6fb3763f64fb0dea50d33c34dc0..2ca8483fd79697b64925929ba7ce35b00d3e2b12 100644
--- a/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
+++ b/src/main/java/net/floodlightcontroller/restserver/RestApiServer.java
@@ -87,8 +87,8 @@ public class RestApiServer
// Add everything in the module context to the rest
for (Class<? extends IFloodlightService> s : fmlContext.getAllServices()) {
- if (logger.isDebugEnabled()) {
- logger.debug("Adding {} for service {} into context",
+ if (logger.isTraceEnabled()) {
+ logger.trace("Adding {} for service {} into context",
s.getCanonicalName(), fmlContext.getServiceImpl(s));
}
context.getAttributes().put(s.getCanonicalName(),
@@ -178,7 +178,7 @@ public class RestApiServer
if (port != null) {
restPort = Integer.parseInt(port);
}
- logger.info("REST port set to {}", restPort);
+ logger.debug("REST port set to {}", restPort);
}
@Override
diff --git a/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
index 1e8cf7c7c234836255d606a26cbca3db935fa867..298c49861236391997dd8adcf72f12d85d89af1e 100644
--- a/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
+++ b/src/main/java/net/floodlightcontroller/topology/TopologyInstance.java
@@ -144,14 +144,14 @@ public class TopologyInstance {
}
public void printTopology() {
- log.debug("-----------------------------------------------");
- log.debug("Links: {}",this.switchPortLinks);
- log.debug("broadcastDomainPorts: {}", broadcastDomainPorts);
- log.debug("tunnelPorts: {}", tunnelPorts);
- log.debug("clusters: {}", clusters);
- log.debug("destinationRootedTrees: {}", destinationRootedTrees);
- log.debug("clusterBroadcastNodePorts: {}", clusterBroadcastNodePorts);
- log.debug("-----------------------------------------------");
+ log.trace("-----------------------------------------------");
+ log.trace("Links: {}",this.switchPortLinks);
+ log.trace("broadcastDomainPorts: {}", broadcastDomainPorts);
+ log.trace("tunnelPorts: {}", tunnelPorts);
+ log.trace("clusters: {}", clusters);
+ log.trace("destinationRootedTrees: {}", destinationRootedTrees);
+ log.trace("clusterBroadcastNodePorts: {}", clusterBroadcastNodePorts);
+ log.trace("-----------------------------------------------");
}
protected void addLinksToOpenflowDomains() {