From 734e8279272e81a27fec8ef1327e8eab38dc07ce Mon Sep 17 00:00:00 2001 From: nickw Date: Wed, 21 Oct 2009 16:09:43 +0000 Subject: Reducing the output level of log messages set to "DEBUG". Debug level messages will be logged at the same level as warnings. Additionally, users will be notified when attempting to run the test suite without first placing the site in debug mode. git-svn-id: http://code.elgg.org/elgg/trunk@3567 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/elgglib.php | 6 +++--- engine/tests/suite.php | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index a77922a9f..7a10cd809 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -266,10 +266,10 @@ function elgg_view($view, $vars = "", $bypass = false, $debug = false, $viewtype } } if (!$success) { - elgg_log(" [This view ($view) does not exist] ", 'ERROR'); + elgg_log("The view $view does not exist", 'ERROR'); } } else if (!file_exists("$view_location$viewtype/$view.php")) { - elgg_log(" [This view ($view) does not exist] ", 'WARNING'); + elgg_log("The view $view does not exist", 'WARNING'); } } @@ -1756,12 +1756,12 @@ function elgg_log($message, $level='NOTICE') { $to_screen = !($CONFIG->debug == 'NOTICE'); switch ($level) { - case 'DEBUG': case 'ERROR': // always report elgg_dump("$level: $message", $to_screen); break; case 'WARNING': + case 'DEBUG': // report execept if user wants only errors if ($CONFIG->debug != 'ERROR') { elgg_dump("$level: $message", $to_screen); diff --git a/engine/tests/suite.php b/engine/tests/suite.php index c3de185ff..8bb7d8064 100755 --- a/engine/tests/suite.php +++ b/engine/tests/suite.php @@ -29,8 +29,7 @@ foreach ($test_files as $file) { // Only run tests in debug mode. if (!isset($CONFIG->debug)) { - // @todo display an error? - exit (1); + exit ('The site must be in debug mode to run unit tests.'); } if (TextReporter::inCli()) { -- cgit v1.2.3