fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/PMCORE-2197 (pull request #7502)

Browse Source 
feature/PMCORE-2197

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Henry Jonathan Quispe Quispe
2020-10-08 13:46:40 +00:00
committed by Julio Cesar Laura Avendaño
parent 0050104ece 5795d922f5
commit 2174536180
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/ScheduleRunCommand.php
View File

@@ -88,7 +88,7 @@ class ScheduleRunCommand extends BaseCommand
return $result; return $result;
} }
return true; return true;
}); })->onOneServer();
} }
}); });
parent::handle(); parent::handle();

4
workflow/engine/src/ProcessMaker/BusinessModel/TaskSchedulerBM.php
View File

@@ -265,9 +265,9 @@ class TaskSchedulerBM
$task->startingTime = $service["startingTime"]; $task->startingTime = $service["startingTime"];
$task->endingTime = $service["endingTime"]; $task->endingTime = $service["endingTime"];
if ($win) { if ($win) {
$task->body = 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force'; $task->body = 'php "' . PATH_TRUNK . $service["filew"] . '" ' . $service["service"] . ' +w' . config("system.workspace") . ' +force +async';
} else { } else {
$task->body = 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force"'; $task->body = 'su -s /bin/sh -c "php ' . PATH_TRUNK . $service["file"] . " " . $service["service"] . ' +w' . config("system.workspace") . ' +force +async"';
} }
$task->expression = $service["expression"]; $task->expression = $service["expression"];
$task->type = "shell"; $task->type = "shell";