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

Merged in mcuiza/processmaker/PM-1468 (pull request #1384)

Browse Source 
PM-1468
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-05 10:39:23 -04:00
parent 4c22016409 af7904fd59
commit 0caa808892
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
workflow/engine/bin/cron_single.php
View File

@@ -533,8 +533,21 @@ function resendEmails()
setExecutionResultMessage("DONE"); setExecutionResultMessage("DONE");
} catch (Exception $e) { } catch (Exception $e) {
setExecutionResultMessage("WITH ERRORS", "error"); $c = new Criteria("workflow");
eprintln(" '-" . $e->getMessage(), "red"); $c->clearSelectColumns();
$c->addSelectColumn(ConfigurationPeer::CFG_UID);
$c->add(ConfigurationPeer::CFG_UID, "Emails");
$result = ConfigurationPeer::doSelectRS($c);
$result->setFetchmode(ResultSet::FETCHMODE_ASSOC);
if($result->next()) {
setExecutionResultMessage("WARNING", "warning");
$message = "Emails won't be sent, but the cron will continue its execution";
eprintln(" '-" . $message, "yellow");
} else {
setExecutionResultMessage("WITH ERRORS", "error");
eprintln(" '-" . $e->getMessage(), "red");
}
saveLog("resendEmails", "error", "Error Resending Emails: " . $e->getMessage()); saveLog("resendEmails", "error", "Error Resending Emails: " . $e->getMessage());
} }
} }
@@ -990,6 +1003,10 @@ function setExecutionResultMessage($m, $t='')
if ($t == 'info') { if ($t == 'info') {
$c = 'yellow'; $c = 'yellow';
} }
if ($t == 'warning') {
$c = 'yellow';
}
eprintln("[$m]", $c); eprintln("[$m]", $c);
} }