Commit 86bf0225 authored by Haixin HUANG(黄海新)'s avatar Haixin HUANG(黄海新) Committed by GitHub
Browse files

Merge pull request #1212 from WeBankPartners/395_workflow_2_0_dev

395 workflow 2 0 dev
parents 4f47e2aa 821b9263
Showing with 24 additions and 8 deletions
+24 -8
...@@ -144,6 +144,11 @@ public class WorkflowEngineService { ...@@ -144,6 +144,11 @@ public class WorkflowEngineService {
String procInstKey = event.getBusinessKey(); String procInstKey = event.getBusinessKey();
String executionId = event.getExecutionId(); 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(); int resultCode = event.getResult();
boolean successful = (resultCode == 0); boolean successful = (resultCode == 0);
...@@ -311,8 +316,8 @@ public class WorkflowEngineService { ...@@ -311,8 +316,8 @@ public class WorkflowEngineService {
break; break;
} }
} }
if(isOneSucceedingFlowNodeStarted){ if (isOneSucceedingFlowNodeStarted) {
nodeStatus = TraceStatus.Completed.name(); nodeStatus = TraceStatus.Completed.name();
} }
} }
......
...@@ -34,12 +34,12 @@ public class PlugableApplicationTaskDispatcher implements JavaDelegate { ...@@ -34,12 +34,12 @@ public class PlugableApplicationTaskDispatcher implements JavaDelegate {
@Override @Override
public void execute(DelegateExecution execution) throws Exception { 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(); String processDefinitionId = execution.getProcessDefinitionId();
log.info("start to call plugin with process instance id [{}] and bizKey [{}]", processInstanceId,
processInstanceBizKey);
ProcessDefinition procDef = execution.getProcessEngine().getRepositoryService().createProcessDefinitionQuery() ProcessDefinition procDef = execution.getProcessEngine().getRepositoryService().createProcessDefinitionQuery()
.processDefinitionId(processDefinitionId).singleResult(); .processDefinitionId(processDefinitionId).singleResult();
......
...@@ -21,10 +21,15 @@ public class ServiceFailureHandleDelegate extends AbstractServiceExceptionHandle ...@@ -21,10 +21,15 @@ public class ServiceFailureHandleDelegate extends AbstractServiceExceptionHandle
@Override @Override
public void execute(DelegateExecution execution) throws Exception { 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); logServiceNodeException(execution, TraceStatus.Faulted, WorkflowConstants.PREFIX_SRV_BEAN_FAILURE);
} }
protected Logger getLogger() { protected Logger getLogger() {
return log; return log;
} }
......
...@@ -16,6 +16,12 @@ public class ServiceTimeoutHandleDelegate extends AbstractServiceExceptionHandle ...@@ -16,6 +16,12 @@ public class ServiceTimeoutHandleDelegate extends AbstractServiceExceptionHandle
@Override @Override
public void execute(DelegateExecution execution) throws Exception { 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); logServiceNodeException(execution, TraceStatus.Timeouted, WorkflowConstants.PREFIX_SRV_BEAN_TIMEOUT);
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment