Merge pull request #1212 from WeBankPartners/395_workflow_2_0_dev

395 workflow 2 0 dev

platform-core/src/main/java/com/webank/wecube/platform/core/service/workflow/WorkflowEngineService.java

@@ -144,6 +144,11 @@ public class WorkflowEngineService {
         String procInstKey = event.getBusinessKey();
         String executionId = event.getExecutionId();
 
+        if (log.isInfoEnabled()) {
+            log.info("handling service invocation result,procInstId={},procInstKey={},executionId={},resultCode={}",
+                    procInstId, procInstKey, executionId, event.getResult());
+        }
+
         int resultCode = event.getResult();
 
         boolean successful = (resultCode == 0);
@@ -311,8 +316,8 @@ public class WorkflowEngineService {
                         break;
                     }
                 }
-                
-                if(isOneSucceedingFlowNodeStarted){
+
+                if (isOneSucceedingFlowNodeStarted) {
                     nodeStatus = TraceStatus.Completed.name();
                 }
             }

platform-workflow/src/main/java/com/webank/wecube/platform/workflow/delegate/PlugableApplicationTaskDispatcher.java

@@ -34,12 +34,12 @@ public class PlugableApplicationTaskDispatcher implements JavaDelegate {
 
     @Override
     public void execute(DelegateExecution execution) throws Exception {
+        if (log.isInfoEnabled()) {
+            log.info("service processing dispatch,inst={},exec={},nodeId={},instKey={}", execution.getProcessInstanceId(),
+                    execution.getId(), execution.getCurrentActivityId(), execution.getProcessBusinessKey());
+        }
 
-        String processInstanceBizKey = execution.getBusinessKey();
-        String processInstanceId = execution.getProcessInstanceId();
         String processDefinitionId = execution.getProcessDefinitionId();
-        log.info("start to call plugin with process instance id [{}] and bizKey [{}]", processInstanceId,
-                processInstanceBizKey);
 
         ProcessDefinition procDef = execution.getProcessEngine().getRepositoryService().createProcessDefinitionQuery()
                 .processDefinitionId(processDefinitionId).singleResult();

platform-workflow/src/main/java/com/webank/wecube/platform/workflow/delegate/ServiceFailureHandleDelegate.java

@@ -21,10 +21,15 @@ public class ServiceFailureHandleDelegate extends AbstractServiceExceptionHandle
 
     @Override
     public void execute(DelegateExecution execution) throws Exception {
-        
+
+        if (log.isInfoEnabled()) {
+            log.info("service processing faulted,inst={},exec={},nodeId={},instKey={}", execution.getProcessInstanceId(),
+                    execution.getId(), execution.getCurrentActivityId(), execution.getProcessBusinessKey());
+        }
+
         logServiceNodeException(execution, TraceStatus.Faulted, WorkflowConstants.PREFIX_SRV_BEAN_FAILURE);
     }
-    
+
     protected Logger getLogger() {
         return log;
     }

platform-workflow/src/main/java/com/webank/wecube/platform/workflow/delegate/ServiceTimeoutHandleDelegate.java

@@ -16,6 +16,12 @@ public class ServiceTimeoutHandleDelegate extends AbstractServiceExceptionHandle
 
     @Override
     public void execute(DelegateExecution execution) throws Exception {
+        
+        if (log.isInfoEnabled()) {
+            log.info("service processing timeouted,inst={},exec={},nodeId={},instKey={}", execution.getProcessInstanceId(),
+                    execution.getId(), execution.getCurrentActivityId(), execution.getProcessBusinessKey());
+        }
+        
         logServiceNodeException(execution, TraceStatus.Timeouted, WorkflowConstants.PREFIX_SRV_BEAN_TIMEOUT);
     }