oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward porting singleton warn vs error for Cron.

Browse source
This commit is contained in:
Colin Kuskie 2008-12-08 19:21:12 +00:00
parent a30d4140d9
commit aabec44de8
3 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Operation/Cron.pm
View file

@ -291,6 +291,13 @@ sub www_runCronJob {
priority => $task->get("priority"),
});
if ( !$instance ) {
if ($session->stow->get('singletonWorkflowClash')) {
$session->errorHandler->warn(
"Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
. "': It is a singleton workflow and is still running from the last invocation."
);
return "done";
}
$session->errorHandler->error(
"Could not create workflow instance for workflowId '" . $task->get( "workflowId" )
. "': The result was undefined"

2
lib/WebGUI/Workflow/Instance.pm
View file

@ -73,8 +73,10 @@ sub create {
$sql .= ' and parameters IS NULL';
}
my ($count) = $session->db->quickArray($sql,$placeHolders);
$session->stow->set('singletonWorkflowClash', 0);
if ($isSingleton && $count) {
$session->log->info("An instance of singleton workflow $properties->{workflowId} already exists, not creating a new one");
$session->stow->set('singletonWorkflowClash', 1);
return undef
}