Commit 524a16b44e9c698d6fbf3e13a7f0074cd4f6fdc8
1 parent
c2f0934d
Merged in from DEV trunk...
KTS-3391 "Checkopenoffice script produces output" Fixed. Committed By: Conrad Vermeulen Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8528 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
1 changed file
with
10 additions
and
4 deletions
bin/scheduler.php
| ... | ... | @@ -218,12 +218,18 @@ if (empty($aList)) |
| 218 | 218 | $iEnd = KTUtil::getBenchmarkTime(); |
| 219 | 219 | $iDuration = number_format($iEnd - $iStart,2); |
| 220 | 220 | |
| 221 | + | |
| 222 | + $ignore = array('open office test'); | |
| 223 | + | |
| 221 | 224 | if (!empty($res)) |
| 222 | 225 | { |
| 223 | - $default->log->info("Scheduler - Task: $sTask"); | |
| 224 | - $default->log->info("Scheduler - Command: $cmd"); | |
| 225 | - $default->log->info("Scheduler - Output: $res"); | |
| 226 | - $default->log->info("Scheduler - Background tasks should not produce output. Please review why this is producing output."); | |
| 226 | + $func = in_array(strtolower($sTask), $ignore)?'debug':'info'; | |
| 227 | + | |
| 228 | + $default->log->$func("Scheduler - Task: $sTask"); | |
| 229 | + $default->log->$func("Scheduler - Command: $cmd"); | |
| 230 | + $default->log->$func("Scheduler - Output: $res"); | |
| 231 | + $default->log->$func("Scheduler - Background tasks should not produce output. Please review why this is producing output."); | |
| 232 | + | |
| 227 | 233 | } |
| 228 | 234 | else |
| 229 | 235 | { | ... | ... |