joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Added configuration variable to disable logging. Currently it is a boolean value, but eventually it will probably be broken out into an array with key/value pairs to correspond with the different logging options within the PICKLES core.

Browse source
This commit is contained in:
Josh Sherman 2011-06-15 21:13:28 -04:00
parent 7fba0d231d
commit 3a89586eb1
6 changed files with 66 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

6
classes/Config.php
View file

@ -181,6 +181,12 @@ class Config extends Object
$this->data['pickles']['profiler'] = false;
}
// Defaults logging to false if it doesn't exist
if (!isset($this->data['pickles']['logging']))
{
$this->data['pickles']['logging'] = false;
}
// Creates constants for the security levels
if (isset($this->data['security']['levels']) && is_array($this->data['security']['levels']))
{

5
classes/Controller.php
View file

@ -119,7 +119,10 @@ class Controller extends Object
}
else
{
Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename);
if ($this->config->pickles['logging'] === true)
{
Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename);
}
}
}

17
classes/Database/PDO/Common.php
View file

@ -128,14 +128,17 @@ class Database_PDO_Common extends Database_Common
{
$this->open();
$loggable_query = $sql;
if ($input_parameters != null)
if ($this->config->pickles['logging'] === true)
{
$loggable_query .= ' -- ' . (JSON_AVAILABLE ? json_encode($input_parameters) : serialize($input_parameters));
}
$loggable_query = $sql;
Log::query($loggable_query);
if ($input_parameters != null)
{
$loggable_query .= ' -- ' . (JSON_AVAILABLE ? json_encode($input_parameters) : serialize($input_parameters));
}
Log::query($loggable_query);
}
$sql = trim($sql);
@ -185,7 +188,7 @@ class Database_PDO_Common extends Database_Common
$end_time = microtime(true);
$duration = $end_time - $start_time;
if ($duration >= 1)
if ($this->config->pickles['logging'] === true && $duration >= 1)
{
Log::slowQuery($duration . ' seconds: ' . $loggable_query);
}

10
classes/Dynamic.php
View file

@ -159,7 +159,10 @@ class Dynamic extends Object
}
else
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
if ($this->config->pickles['logging'] === true)
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
}
}
$reference = $this->reference($reference);
@ -253,7 +256,10 @@ class Dynamic extends Object
}
else
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
if ($this->config->pickles['logging'] === true)
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
}
}
$reference = $this->reference($reference);

8
classes/Error.php
View file

@ -32,11 +32,13 @@ class Error
*/
public static function fatal($message)
{
if (Log::error($message) == false)
if ($this->config->pickles['logging'] === true)
{
$message .= '<br /><br />This error message could not be logged as the log path or log file is not writable';
if (Log::error($message) == false)
{
$message .= '<br /><br />This error message could not be logged as the log path or log file is not writable';
}
}
?>
<!DOCTYPE html>
<html>

46
jar.php
View file

@ -181,6 +181,12 @@ class Config extends Object
$this->data['pickles']['profiler'] = false;
}
// Defaults logging to false if it doesn't exist
if (!isset($this->data['pickles']['logging']))
{
$this->data['pickles']['logging'] = false;
}
// Creates constants for the security levels
if (isset($this->data['security']['levels']) && is_array($this->data['security']['levels']))
{
@ -406,7 +412,10 @@ class Controller extends Object
}
else
{
Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename);
if ($this->config->pickles['logging'] === true)
{
Log::warning('Class named ' . $module_class . ' was not found in ' . $module_filename);
}
}
}
@ -1350,14 +1359,17 @@ class Database_PDO_Common extends Database_Common
{
$this->open();
$loggable_query = $sql;
if ($input_parameters != null)
if ($this->config->pickles['logging'] === true)
{
$loggable_query .= ' -- ' . (JSON_AVAILABLE ? json_encode($input_parameters) : serialize($input_parameters));
}
$loggable_query = $sql;
Log::query($loggable_query);
if ($input_parameters != null)
{
$loggable_query .= ' -- ' . (JSON_AVAILABLE ? json_encode($input_parameters) : serialize($input_parameters));
}
Log::query($loggable_query);
}
$sql = trim($sql);
@ -1407,7 +1419,7 @@ class Database_PDO_Common extends Database_Common
$end_time = microtime(true);
$duration = $end_time - $start_time;
if ($duration >= 1)
if ($this->config->pickles['logging'] === true && $duration >= 1)
{
Log::slowQuery($duration . ' seconds: ' . $loggable_query);
}
@ -2455,7 +2467,10 @@ class Dynamic extends Object
}
else
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
if ($this->config->pickles['logging'] === true)
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
}
}
$reference = $this->reference($reference);
@ -2549,7 +2564,10 @@ class Dynamic extends Object
}
else
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
if ($this->config->pickles['logging'] === true)
{
Log::warning('Unable to minify ' . $original_reference . ' and a minified copy does not already exist');
}
}
$reference = $this->reference($reference);
@ -2607,11 +2625,13 @@ class Error
*/
public static function fatal($message)
{
if (Log::error($message) == false)
if ($this->config->pickles['logging'] === true)
{
$message .= '<br /><br />This error message could not be logged as the log path or log file is not writable';
if (Log::error($message) == false)
{
$message .= '<br /><br />This error message could not be logged as the log path or log file is not writable';
}
}
?>
<!DOCTYPE html>
<html>