From 786d298130df150aba6f9ca3909d7cbfaa30b05e Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Mon, 25 Jun 2012 12:37:06 -0400 Subject: [PATCH] BUG 5737 Add logs to new case with CaseScheduler SOLVED I add logs to CaseScheduler I add logs to executeEvents --- workflow/engine/bin/cron_single.php | 26 ++++++++++++------- workflow/engine/classes/model/AppEvent.php | 12 ++++++--- .../engine/classes/model/CaseScheduler.php | 4 +-- 3 files changed, 28 insertions(+), 14 deletions(-) diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php index 8935c445d..144b8bc8f 100755 --- a/workflow/engine/bin/cron_single.php +++ b/workflow/engine/bin/cron_single.php @@ -8,7 +8,7 @@ error_reporting(E_ALL); ini_set('memory_limit', '128M'); if (!defined('SYS_LANG')) { - define('SYS_LANG', 'en'); + define('SYS_LANG', 'en'); } if (!defined('PATH_HOME')) { @@ -169,7 +169,7 @@ if (!defined('SYS_SYS')) { unlink(PATH_CORE . 'config/_databases_.php'); } else { - processWorkspace(); + processWorkspace(); } //finally update the file @@ -206,8 +206,8 @@ function resendEmails() { $aSpoolWarnings = $oSpool->getWarnings(); if( $aSpoolWarnings !== false ) { foreach($aSpoolWarnings as $sWarning){ - print('MAIL SPOOL WARNING: ' . $sWarning."\n"); - saveLog('resendEmails', 'warning', 'MAIL SPOOL WARNING: ' . $sWarning); + print('MAIL SPOOL WARNING: ' . $sWarning."\n"); + saveLog('resendEmails', 'warning', 'MAIL SPOOL WARNING: ' . $sWarning); } } setExecutionResultMessage('DONE'); @@ -289,6 +289,8 @@ function executeEvents($sLastExecution, $sNow=null) { global $sFilter; global $sNow; + $log = array(); + if($sFilter!='' && strpos($sFilter, 'events') === false) return false; setExecutionMessage("Executing events"); @@ -296,7 +298,10 @@ function executeEvents($sLastExecution, $sNow=null) { try { $oAppEvent = new AppEvent(); 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"); setExecutionResultMessage("Processed $n"); //saveLog('executeEvents', 'action', $res ); @@ -312,6 +317,8 @@ function executeScheduledCases($sNow=null){ try{ global $sFilter; global $sNow; + $log = array(); + if($sFilter!='' && strpos($sFilter, 'scheduler') === false) return false; setExecutionMessage("Executing the scheduled starting cases"); @@ -319,10 +326,11 @@ function executeScheduledCases($sNow=null){ $sNow = isset($sNow)? $sNow: date('Y-m-d H:i:s'); $oCaseScheduler = new CaseScheduler; - $oCaseScheduler->caseSchedulerCron($sNow); - $log = array(); - foreach ($log as $value){ - saveLog('executeScheduledCases', 'action', "OK Case# $value"); + + $oCaseScheduler->caseSchedulerCron($sNow, $log); + + foreach ($log as $value) { + saveLog('executeScheduledCases', 'action', "OK Case# $value"); } setExecutionResultMessage('DONE'); } catch(Exception $oError){ diff --git a/workflow/engine/classes/model/AppEvent.php b/workflow/engine/classes/model/AppEvent.php index 0d70dee6a..0cff92313 100755 --- a/workflow/engine/classes/model/AppEvent.php +++ b/workflow/engine/classes/model/AppEvent.php @@ -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/Triggers.php'; @@ -240,8 +240,9 @@ class AppEvent extends BaseAppEvent { require_once 'classes/model/Application.php'; $oApp = ApplicationPeer::retrieveByPk($aRow['APP_UID']); $oEv = EventPeer::retrieveByPk($aRow['EVN_UID']); - - println("\nOK+ event \"".$oEv->getEvnDescription()."\" with ID {$aRow['EVN_UID']} was found"); + $log[] = 'Event ' . $oEv->getEvnDescription() . ' with ID ' . $aRow['EVN_UID']; + + println("\nOK+ event \"".$oEv->getEvnDescription()."\" with ID {} was found"); println(" - PROCESS................".$aRow['PRO_UID']); println(" - APPLICATION............".$aRow['APP_UID']." CASE #".$oApp->getAppNumber()); println(" - ACTION DATE............".$aRow['APP_EVN_ACTION_DATE']); @@ -251,6 +252,7 @@ class AppEvent extends BaseAppEvent { if ($aRow['TRI_UID'] == '') { //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"); $oAppEvent->setAppEvnStatus('CLOSE'); $oAppEvent->save(); @@ -260,6 +262,7 @@ class AppEvent extends BaseAppEvent { $oTrigger = TriggersPeer::retrieveByPk($aRow['TRI_UID']); if( !is_object($oTrigger) ){ //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"); $oAppEvent->setAppEvnStatus('CLOSE'); $oAppEvent->save(); @@ -276,6 +279,7 @@ class AppEvent extends BaseAppEvent { $oAppEvent->setAppEvnLastExecutionDate(date('Y-m-d H:i:s')); 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!"); //g::pr($aFields); $aFields['APP_DATA'] = $oPMScript->aFields; @@ -283,6 +287,7 @@ class AppEvent extends BaseAppEvent { $oAppEvent->setAppEvnStatus('CLOSE'); } else { if($debug) { + $log[] = ' - The trigger ' . $aRow['TRI_UID'] . ' throw some errors!'; println(" - The trigger {$aRow['TRI_UID']} throw some errors!"); print_r($_SESSION['TRIGGER_DEBUG']['ERRORS']); } @@ -297,6 +302,7 @@ class AppEvent extends BaseAppEvent { return $c; } catch (Exception $oError) { + $log[] = ' Error execute event : ' . $oError->getMessage(); die($oError->getMessage()); return $oError->getMessage(); } diff --git a/workflow/engine/classes/model/CaseScheduler.php b/workflow/engine/classes/model/CaseScheduler.php index adf1ade90..984d30203 100755 --- a/workflow/engine/classes/model/CaseScheduler.php +++ b/workflow/engine/classes/model/CaseScheduler.php @@ -462,7 +462,7 @@ class CaseScheduler extends BaseCaseScheduler { $caseId = $result->caseId; $caseNumber = $result->caseNumber; - $log[]=$caseNumber. ' was created!, ProcessID: '.$aRow['PRO_UID']; + $log[] = $caseNumber. ' was created!, ProcessID: '.$aRow['PRO_UID']; $paramsLog ['WS_CREATE_CASE_STATUS'] = "Case " . $caseNumber . " " . strip_tags ( $result->message ); $paramsLogResult = 'SUCCESS'; @@ -585,7 +585,7 @@ class CaseScheduler extends BaseCaseScheduler { eprintln("OK+ CASE #{$result->caseNumber} was created!", 'green'); $caseId = $result->caseId; $caseNumber = $result->caseNumber; - $log[]=$caseNumber. ' was created!, ProcessID: '.$aRow['PRO_UID']; + $log[] = $caseNumber. ' was created!, ProcessID: '.$aRow['PRO_UID']; $paramsLog ['WS_CREATE_CASE_STATUS'] = "Case " . $caseNumber . " " . strip_tags ( $result->message ); $paramsLogResult = 'SUCCESS';