summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2018-11-09 15:48:47 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2018-11-09 15:48:47 -0500
commitfa7681ae396d0e9e75525a936fdbacc064094127 (patch)
tree7d337445b2b43500936bb26ade33825239a6e552
parent0b54783bf2165af50a5b612c584a5a6243e00590 (diff)
Fix node id / type in log entry
Node id and type in log entries are not correct for nodes within a block, for example. Change-Id: I4023de08215ba6de5bfdd2a561048d9fe84201e5 Issue-ID: CCSDK-657 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
-rwxr-xr-xsli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
index dd7139a7..c5a848a1 100755
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
@@ -154,8 +154,6 @@ public class SvcLogicServiceImpl implements SvcLogicService {
LOG.info("About to execute graph {}", graph.toString());
try {
while (curNode != null) {
- MDC.put("nodeId", curNode.getNodeId() + " (" + curNode.getNodeType() + ")");
- LOG.info("About to execute node # {} ({})", curNode.getNodeId(), curNode.getNodeType());
SvcLogicNode nextNode = executeNode(curNode, ctx);
curNode = nextNode;
@@ -174,6 +172,8 @@ public class SvcLogicServiceImpl implements SvcLogicService {
return (null);
}
+ LOG.info("About to execute node # {} ({})", node.getNodeId(), node.getNodeType());
+
if (LOG.isDebugEnabled()) {
LOG.debug("Executing node {}", node.getNodeId());
}
@@ -183,6 +183,8 @@ public class SvcLogicServiceImpl implements SvcLogicService {
if (executor != null) {
LOG.debug("Executing node executor for node type {} - {}", node.getNodeType(),
executor.getClass().getName());
+
+ MDC.put("nodeId", node.getNodeId() + " (" + node.getNodeType() + ")");
return (executor.execute(this, node, ctx));
} else {
throw new SvcLogicException("Attempted to execute a node of type " + node.getNodeType() + ", but no executor was registered for this type");