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

BUG 5737 Add logs to new case with CaseScheduler SOLVED

Browse Source 
I add logs to CaseScheduler
I add logs to executeEvents
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-06-25 12:37:06 -04:00
parent 7b677377bb
commit 786d298130
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,6 +289,8 @@ function executeEvents($sLastExecution, $sNow=null) {
global $sFilter; global $sFilter;
global $sNow; global $sNow;
$log = array();
if($sFilter!='' && strpos($sFilter, 'events') === false) return false; if($sFilter!='' && strpos($sFilter, 'events') === false) return false;
setExecutionMessage("Executing events"); setExecutionMessage("Executing events");
@@ -296,7 +298,10 @@ function executeEvents($sLastExecution, $sNow=null) {
try { try {
$oAppEvent = new AppEvent(); $oAppEvent = new AppEvent();
saveLog('executeEvents', 'action', "Executing Events $sLastExecution, $sNow "); saveLog('executeEvents', 'action', "Executing Events $sLastExecution, $sNow ");
$n = $oAppEvent->executeEvents($sNow); $n = $oAppEvent->executeEvents($sNow, false, $log);
foreach ($log as $value) {
saveLog('executeEvents', 'action', "Execute Events : $value, $sNow ");
}
setExecutionMessage("|- End Execution events"); setExecutionMessage("|- End Execution events");
setExecutionResultMessage("Processed $n"); setExecutionResultMessage("Processed $n");
//saveLog('executeEvents', 'action', $res ); //saveLog('executeEvents', 'action', $res );
@@ -312,6 +317,8 @@ function executeScheduledCases($sNow=null){
try{ try{
global $sFilter; global $sFilter;
global $sNow; global $sNow;
$log = array();
if($sFilter!='' && strpos($sFilter, 'scheduler') === false) return false; if($sFilter!='' && strpos($sFilter, 'scheduler') === false) return false;
setExecutionMessage("Executing the scheduled starting cases"); setExecutionMessage("Executing the scheduled starting cases");
@@ -319,8 +326,9 @@ function executeScheduledCases($sNow=null){
$sNow = isset($sNow)? $sNow: date('Y-m-d H:i:s'); $sNow = isset($sNow)? $sNow: date('Y-m-d H:i:s');
$oCaseScheduler = new CaseScheduler; $oCaseScheduler = new CaseScheduler;
$oCaseScheduler->caseSchedulerCron($sNow);
$log = array(); $oCaseScheduler->caseSchedulerCron($sNow, $log);
foreach ($log as $value) { foreach ($log as $value) {
saveLog('executeScheduledCases', 'action', "OK Case# $value"); saveLog('executeScheduledCases', 'action', "OK Case# $value");
} }

10
workflow/engine/classes/model/AppEvent.php
View File

@@ -180,7 +180,7 @@ class AppEvent extends BaseAppEvent {
} }
} }
function executeEvents($sNow, $debug=false) { function executeEvents($sNow, $debug=false, &$log=array()) {
require_once 'classes/model/Configuration.php'; require_once 'classes/model/Configuration.php';
require_once 'classes/model/Triggers.php'; require_once 'classes/model/Triggers.php';
@@ -240,8 +240,9 @@ class AppEvent extends BaseAppEvent {
require_once 'classes/model/Application.php'; require_once 'classes/model/Application.php';
$oApp = ApplicationPeer::retrieveByPk($aRow['APP_UID']); $oApp = ApplicationPeer::retrieveByPk($aRow['APP_UID']);
$oEv = EventPeer::retrieveByPk($aRow['EVN_UID']); $oEv = EventPeer::retrieveByPk($aRow['EVN_UID']);
$log[] = 'Event ' . $oEv->getEvnDescription() . ' with ID ' . $aRow['EVN_UID'];
println("\nOK+ event \"".$oEv->getEvnDescription()."\" with ID {$aRow['EVN_UID']} was found"); println("\nOK+ event \"".$oEv->getEvnDescription()."\" with ID {} was found");
println(" - PROCESS................".$aRow['PRO_UID']); println(" - PROCESS................".$aRow['PRO_UID']);
println(" - APPLICATION............".$aRow['APP_UID']." CASE #".$oApp->getAppNumber()); println(" - APPLICATION............".$aRow['APP_UID']." CASE #".$oApp->getAppNumber());
println(" - ACTION DATE............".$aRow['APP_EVN_ACTION_DATE']); println(" - ACTION DATE............".$aRow['APP_EVN_ACTION_DATE']);
@@ -251,6 +252,7 @@ class AppEvent extends BaseAppEvent {
if ($aRow['TRI_UID'] == '') { if ($aRow['TRI_UID'] == '') {
//a rare case when the tri_uid is not set. //a rare case when the tri_uid is not set.
$log[] = " (!) Any trigger was set................................SKIPPED and will be CLOSED";
if($debug) println(" (!) Any trigger was set................................SKIPPED and will be CLOSED"); if($debug) println(" (!) Any trigger was set................................SKIPPED and will be CLOSED");
$oAppEvent->setAppEvnStatus('CLOSE'); $oAppEvent->setAppEvnStatus('CLOSE');
$oAppEvent->save(); $oAppEvent->save();
@@ -260,6 +262,7 @@ class AppEvent extends BaseAppEvent {
$oTrigger = TriggersPeer::retrieveByPk($aRow['TRI_UID']); $oTrigger = TriggersPeer::retrieveByPk($aRow['TRI_UID']);
if( !is_object($oTrigger) ){ if( !is_object($oTrigger) ){
//the trigger record doesn't exist.. //the trigger record doesn't exist..
$log[] = ' (!) The trigger ' . $aRow['TRI_UID'] . ' ' . $oTrigger->getTriTitle() . " doesn't exist.......SKIPPED and will be CLOSED";
if($debug) println(" (!) The trigger {$aRow['TRI_UID']} {$oTrigger->getTriTitle()} doesn't exist.......SKIPPED and will be CLOSED"); if($debug) println(" (!) The trigger {$aRow['TRI_UID']} {$oTrigger->getTriTitle()} doesn't exist.......SKIPPED and will be CLOSED");
$oAppEvent->setAppEvnStatus('CLOSE'); $oAppEvent->setAppEvnStatus('CLOSE');
$oAppEvent->save(); $oAppEvent->save();
@@ -276,6 +279,7 @@ class AppEvent extends BaseAppEvent {
$oAppEvent->setAppEvnLastExecutionDate(date('Y-m-d H:i:s')); $oAppEvent->setAppEvnLastExecutionDate(date('Y-m-d H:i:s'));
if( sizeof($_SESSION['TRIGGER_DEBUG']['ERRORS']) == 0 ){ if( sizeof($_SESSION['TRIGGER_DEBUG']['ERRORS']) == 0 ){
$log[] = ' - The trigger ' . $oTrigger->getTriTitle() . ' was executed successfully!';
if($debug) println(" - The trigger '{$oTrigger->getTriTitle()}' was executed successfully!"); if($debug) println(" - The trigger '{$oTrigger->getTriTitle()}' was executed successfully!");
//g::pr($aFields); //g::pr($aFields);
$aFields['APP_DATA'] = $oPMScript->aFields; $aFields['APP_DATA'] = $oPMScript->aFields;
@@ -283,6 +287,7 @@ class AppEvent extends BaseAppEvent {
$oAppEvent->setAppEvnStatus('CLOSE'); $oAppEvent->setAppEvnStatus('CLOSE');
} else { } else {
if($debug) { if($debug) {
$log[] = ' - The trigger ' . $aRow['TRI_UID'] . ' throw some errors!';
println(" - The trigger {$aRow['TRI_UID']} throw some errors!"); println(" - The trigger {$aRow['TRI_UID']} throw some errors!");
print_r($_SESSION['TRIGGER_DEBUG']['ERRORS']); print_r($_SESSION['TRIGGER_DEBUG']['ERRORS']);
} }
@@ -297,6 +302,7 @@ class AppEvent extends BaseAppEvent {
return $c; return $c;
} }
catch (Exception $oError) { catch (Exception $oError) {
$log[] = ' Error execute event : ' . $oError->getMessage();
die($oError->getMessage()); die($oError->getMessage());
return $oError->getMessage(); return $oError->getMessage();
} }