Improving logging.

Change-Id: Ic4b8d30eccbaf175f6352b775aa2f80f31c425b5
Signed-off-by: Jozef Gloncak <jgloncak@cisco.com>

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/callback/BaseCallback.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/callback/BaseCallback.java
index 96ad46cc60f6ea9e9d2ffcc5551f23cb884fba5a..86b21e1213d36018538f298947d8269a81918a9f 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/callback/BaseCallback.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/callback/BaseCallback.java
@@ -51,13 +51,18 @@ public class BaseCallback<I, O> implements FutureCallback<RpcResult<I>> {
             deviceContext.unhookRequestCtx(getRequestContext().getXid());
 
             // handle requestContext failure
-            StringBuilder rpcErrors = new StringBuilder();
-            if (null != fRpcResult.getErrors() && fRpcResult.getErrors().size() > 0) {
-                for (RpcError error : fRpcResult.getErrors()) {
-                    rpcErrors.append(error.getMessage());
+            if (LOG.isTraceEnabled()) {
+                StringBuilder rpcErrors = new StringBuilder();
+                if (null != fRpcResult.getErrors() && fRpcResult.getErrors().size() > 0) {
+                    for (RpcError error : fRpcResult.getErrors()) {
+                        rpcErrors.append(error.getMessage());
+                            LOG.trace("Errors from rpc result.. ",error);
+                    }
                 }
+                LOG.trace("OF Java result for XID {} was not successful. Errors : {}", getRequestContext().getXid().getValue(), rpcErrors.toString());
+            
             }
-            LOG.trace("OF Java result for XID {} was not successful. Errors : {}", getRequestContext().getXid().getValue(), rpcErrors.toString());
+
             getRequestContext().getFuture().set(
                     RpcResultBuilder.<O>failed().withRpcErrors(fRpcResult.getErrors()).build());
             RequestContextUtil.closeRequstContext(getRequestContext());

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
index 569223daffebaeb0dcdfcb65bc610abe0ea96dfb..55114109d089e711724315fc88eb7c367bbd32af 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/SalFlowServiceImpl.java
@@ -122,6 +122,7 @@ public class SalFlowServiceImpl extends CommonService implements SalFlowService
                     @Override
                     public void onFailure(final Throwable throwable) {
                         getMessageSpy().spyMessage(input.getImplementedInterface(), MessageSpy.STATISTIC_GROUP.TO_SWITCH_SUBMIT_FAILURE);
+                        LOG.trace("Flow modification failed..", throwable);
                         StringBuffer errors = new StringBuffer();
                         try {
                             RpcResult<Void> result = future.get();
@@ -133,8 +134,9 @@ public class SalFlowServiceImpl extends CommonService implements SalFlowService
                             }
                         } catch (InterruptedException | ExecutionException e) {
                             LOG.trace("Flow modification failed. Can't read errors from RpcResult.");
+                        } finally {
+                            LOG.trace("Flow modification failed. Errors : {}", errors.toString());
                         }
-                        LOG.trace("Flow modification failed. Errors : {}", errors.toString());
                     }
                 });
                 return future;