[ci skip] Change some log messages' level
'Class Loaded' type of messages flood log files when
log_threshold is set to 2 (debug). They're now logged
as 'info' level.
This is manually applying PR #1528, which was created
to do the same thing, but became outdated.
diff --git a/system/core/Config.php b/system/core/Config.php
index d5ce91f..3828fae 100644
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -72,6 +72,8 @@
*/
public $_config_paths = array(APPPATH);
+ // --------------------------------------------------------------------
+
/**
* Class constructor
*
@@ -82,7 +84,6 @@
public function __construct()
{
$this->config =& get_config();
- log_message('debug', 'Config Class Initialized');
// Set the base_url automatically if none was provided
if (empty($this->config['base_url']))
@@ -101,6 +102,8 @@
$this->set_item('base_url', $base_url);
}
+
+ log_message('info', 'Config Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 06005b0..4ad10fc 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -77,7 +77,7 @@
$this->load =& load_class('Loader', 'core');
$this->load->initialize();
- log_message('debug', 'Controller Class Initialized');
+ log_message('info', 'Controller Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index 429d6bc..a55b38a 100644
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -88,8 +88,7 @@
public function __construct()
{
$CFG =& load_class('Config', 'core');
-
- log_message('debug', 'Hooks Class Initialized');
+ log_message('info', 'Hooks Class Initialized');
// If hooks are not enabled in the config file
// there is nothing else to do
diff --git a/system/core/Input.php b/system/core/Input.php
index 358417c..1816a20 100644
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -123,8 +123,6 @@
*/
public function __construct()
{
- log_message('debug', 'Input Class Initialized');
-
$this->_allow_get_array = (config_item('allow_get_array') === TRUE);
$this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
$this->_enable_csrf = (config_item('csrf_protection') === TRUE);
@@ -140,6 +138,8 @@
// Sanitize global arrays
$this->_sanitize_globals();
+
+ log_message('info', 'Input Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Lang.php b/system/core/Lang.php
index fe1dc1a..3213478 100644
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -69,7 +69,7 @@
*/
public function __construct()
{
- log_message('debug', 'Language Class Initialized');
+ log_message('info', 'Language Class Initialized');
}
// --------------------------------------------------------------------
@@ -172,7 +172,7 @@
$this->is_loaded[$langfile] = $idiom;
$this->language = array_merge($this->language, $lang);
- log_message('debug', 'Language file loaded: language/'.$idiom.'/'.$langfile);
+ log_message('info', 'Language file loaded: language/'.$idiom.'/'.$langfile);
return TRUE;
}
diff --git a/system/core/Loader.php b/system/core/Loader.php
index d930dbf..cce1b12 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -138,7 +138,7 @@
$this->_ci_ob_level = ob_get_level();
$this->_ci_classes =& is_loaded();
- log_message('debug', 'Loader Class Initialized');
+ log_message('info', 'Loader Class Initialized');
}
// --------------------------------------------------------------------
@@ -577,7 +577,7 @@
include_once($base_helper);
$this->_ci_helpers[$helper] = TRUE;
- log_message('debug', 'Helper loaded: '.$helper);
+ log_message('info', 'Helper loaded: '.$helper);
continue;
}
@@ -589,7 +589,7 @@
include_once($path.'helpers/'.$helper.'.php');
$this->_ci_helpers[$helper] = TRUE;
- log_message('debug', 'Helper loaded: '.$helper);
+ log_message('info', 'Helper loaded: '.$helper);
break;
}
}
@@ -914,7 +914,7 @@
include($_ci_path); // include() vs include_once() allows for multiple views with the same name
}
- log_message('debug', 'File loaded: '.$_ci_path);
+ log_message('info', 'File loaded: '.$_ci_path);
// Return the file data if requested
if ($_ci_return === TRUE)
diff --git a/system/core/Model.php b/system/core/Model.php
index 1cb00f7..d1487b6 100644
--- a/system/core/Model.php
+++ b/system/core/Model.php
@@ -55,7 +55,7 @@
*/
public function __construct()
{
- log_message('debug', 'Model Class Initialized');
+ log_message('info', 'Model Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Output.php b/system/core/Output.php
index beac6b3..6b9a33d 100644
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -141,7 +141,7 @@
// Get mime types for later
$this->mimes =& get_mimes();
- log_message('debug', 'Output Class Initialized');
+ log_message('info', 'Output Class Initialized');
}
// --------------------------------------------------------------------
@@ -491,7 +491,7 @@
}
echo $output;
- log_message('debug', 'Final output sent to browser');
+ log_message('info', 'Final output sent to browser');
log_message('debug', 'Total execution time: '.$elapsed);
return;
}
@@ -528,7 +528,7 @@
echo $output; // Send it to the browser!
}
- log_message('debug', 'Final output sent to browser');
+ log_message('info', 'Final output sent to browser');
log_message('debug', 'Total execution time: '.$elapsed);
}
diff --git a/system/core/Router.php b/system/core/Router.php
index b21335f..c7acad0 100644
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -147,7 +147,7 @@
}
}
- log_message('debug', 'Router Class Initialized');
+ log_message('info', 'Router Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Security.php b/system/core/Security.php
index 2bf0f62..4f5d954 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -192,7 +192,7 @@
$this->charset = strtoupper(config_item('charset'));
- log_message('debug', 'Security Class Initialized');
+ log_message('info', 'Security Class Initialized');
}
// --------------------------------------------------------------------
@@ -244,7 +244,7 @@
$this->_csrf_set_hash();
$this->csrf_set_cookie();
- log_message('debug', 'CSRF token verified');
+ log_message('info', 'CSRF token verified');
return $this;
}
@@ -275,7 +275,7 @@
$secure_cookie,
config_item('cookie_httponly')
);
- log_message('debug', 'CRSF cookie Set');
+ log_message('info', 'CRSF cookie sent');
return $this;
}
@@ -533,7 +533,6 @@
return ($str === $converted_string);
}
- log_message('debug', 'XSS Filtering completed');
return $str;
}
diff --git a/system/core/URI.php b/system/core/URI.php
index 39d1a8f..a249e57 100644
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -140,7 +140,7 @@
}
}
- log_message('debug', 'URI Class Initialized');
+ log_message('info', 'URI Class Initialized');
}
// --------------------------------------------------------------------
diff --git a/system/core/Utf8.php b/system/core/Utf8.php
index bca95c2..2611a6b 100644
--- a/system/core/Utf8.php
+++ b/system/core/Utf8.php
@@ -74,7 +74,7 @@
log_message('debug', 'UTF-8 Support Disabled');
}
- log_message('debug', 'Utf8 Class Initialized');
+ log_message('info', 'Utf8 Class Initialized');
}
// --------------------------------------------------------------------