Peter M. Groen / knowledgetree

Commit 952f656b6f5fb6999272b981a197042e4b43bb50

Authored by kevin_fourie
1 parent 55f36a0a

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/branches/3.5.3-Branch@8527 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 19 additions and 13 deletions
bin/scheduler.php
  View file @952f656
... ... @@ -6,31 +6,31 @@
6 6 * Document Management Made Simple
7 7 * Copyright (C) 2008 KnowledgeTree Inc.
8 8 * Portions copyright The Jam Warehouse Software (Pty) Limited
9   - *
  9 + *
10 10 * This program is free software; you can redistribute it and/or modify it under
11 11 * the terms of the GNU General Public License version 3 as published by the
12 12 * Free Software Foundation.
13   - *
  13 + *
14 14 * This program is distributed in the hope that it will be useful, but WITHOUT
15 15 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
16 16 * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
17 17 * details.
18   - *
  18 + *
19 19 * You should have received a copy of the GNU General Public License
20 20 * along with this program. If not, see <http://www.gnu.org/licenses/>.
21   - *
22   - * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
  21 + *
  22 + * You can contact KnowledgeTree Inc., PO Box 7775 #87847, San Francisco,
23 23 * California 94120-7775, or email info@knowledgetree.com.
24   - *
  24 + *
25 25 * The interactive user interfaces in modified source and object code versions
26 26 * of this program must display Appropriate Legal Notices, as required under
27 27 * Section 5 of the GNU General Public License version 3.
28   - *
  28 + *
29 29 * In accordance with Section 7(b) of the GNU General Public License version 3,
30 30 * these Appropriate Legal Notices must retain the display of the "Powered by
31   - * KnowledgeTree" logo and retain the original copyright notice. If the display of the
  31 + * KnowledgeTree" logo and retain the original copyright notice. If the display of the
32 32 * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
33   - * must display the words "Powered by KnowledgeTree" and retain the original
  33 + * must display the words "Powered by KnowledgeTree" and retain the original
34 34 * copyright notice.
35 35 * Contributor( s): ______________________________________
36 36 *
... ... @@ -219,12 +219,18 @@ if (empty($aList))
219 219 $iEnd = KTUtil::getBenchmarkTime();
220 220 $iDuration = number_format($iEnd - $iStart,2);
221 221  
  222 +
  223 + $ignore = array('open office test');
  224 +
222 225 if (!empty($res))
223 226 {
224   - $default->log->info("Scheduler - Task: $sTask");
225   - $default->log->info("Scheduler - Command: $cmd");
226   - $default->log->info("Scheduler - Output: $res");
227   - $default->log->info("Scheduler - Background tasks should not produce output. Please review why this is producing output.");
  227 + $func = in_array(strtolower($sTask), $ignore)?'debug':'info';
  228 +
  229 + $default->log->$func("Scheduler - Task: $sTask");
  230 + $default->log->$func("Scheduler - Command: $cmd");
  231 + $default->log->$func("Scheduler - Output: $res");
  232 + $default->log->$func("Scheduler - Background tasks should not produce output. Please review why this is producing output.");
  233 +
228 234 }
229 235 else
230 236 {
... ...