aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/Error.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-05 16:54:16 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-05 16:54:16 +0100
commit51a71ec4b9d62528054be8faee1576a8fd6d37f6 (patch)
treef92299dd5314aef43e9e69e8fde317b9b7790213 /lib/Minz/Error.php
parent7584364a4c2b407e97909e94ba274da62620abea (diff)
New configuration system (not working yet)
- Use only Minz_Configuration - register() method to load a new configuration file - get() to get a configuration - new exceptions related to configuration - fix a list configuration calls to have FRSS working Current problems to resolve: - How to handle configuration param verifications (i.e. check auth_type is a value from none, http_auth, persona or form) - We must use $conf = Minz_Configuration::get('system'); $general_conf = $conf->general; to access global system configuration which is quite annoying. How to change that? See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'lib/Minz/Error.php')
-rw-r--r--lib/Minz/Error.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/Minz/Error.php b/lib/Minz/Error.php
index e5f3dff07..6af23a566 100644
--- a/lib/Minz/Error.php
+++ b/lib/Minz/Error.php
@@ -82,7 +82,8 @@ class Minz_Error {
* > en fonction de l'environment
*/
private static function processLogs ($logs) {
- $env = Minz_Configuration::environment ();
+ $conf = Minz_Configuration::get('system');
+ $env = $conf->general['environment'];
$logs_ok = array ();
$error = array ();
$warning = array ();
@@ -98,10 +99,10 @@ class Minz_Error {
$notice = $logs['notice'];
}
- if ($env == Minz_Configuration::PRODUCTION) {
+ if ($env == 'production') {
$logs_ok = $error;
}
- if ($env == Minz_Configuration::DEVELOPMENT) {
+ if ($env == 'development') {
$logs_ok = array_merge ($error, $warning, $notice);
}