diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-19 09:45:43 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-19 09:45:43 +0400 |
| commit | b367c951b990b38677e67f1a1756cd4d1eaee50b (patch) | |
| tree | add34051f1c8425df7ddcbfefd7531bdff5ab891 /include | |
| parent | f1c6dd7e90d43b36417b33907ffe96b56b95f27c (diff) | |
make logging configurable; add logging to syslog
Diffstat (limited to 'include')
| -rw-r--r-- | include/errorhandler.php | 21 | ||||
| -rw-r--r-- | include/sanity_config.php | 4 |
2 files changed, 4 insertions, 21 deletions
diff --git a/include/errorhandler.php b/include/errorhandler.php index 2c8d35f83..9acef2357 100644 --- a/include/errorhandler.php +++ b/include/errorhandler.php @@ -1,22 +1,12 @@ <?php -// TODO: make configurable -require_once "classes/logger.php"; -require_once "classes/logger/sql.php"; - function ttrss_error_handler($errno, $errstr, $file, $line, $context) { global $logger; if (error_reporting() == 0 || !$errno) return false; - if (!$logger) $logger = new Logger_SQL(); - $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); - if ($logger) { - return $logger->log_error($errno, $errstr, $file, $line, $context); - } - - return false; + return Logger::get()->log_error($errno, $errstr, $file, $line, $context); } function ttrss_fatal_handler() { @@ -36,14 +26,7 @@ function ttrss_fatal_handler() { $file = substr(str_replace(dirname(dirname(__FILE__)), "", $file), 1); - if (!$logger) $logger = new Logger_SQL(); - - if ($logger) { - if ($logger->log_error($errno, $errstr, $file, $line, $context)) { - return true; - } - } - return false; + return Logger::get()->log_error($errno, $errstr, $file, $line, $context); } return false; diff --git a/include/sanity_config.php b/include/sanity_config.php index d5cfd2d78..7d8afe102 100644 --- a/include/sanity_config.php +++ b/include/sanity_config.php @@ -1,3 +1,3 @@ -<?php # This file has been generated at: Tue Apr 16 16:41:13 MSK 2013 +<?php # This file has been generated at: Fri Apr 19 09:22:33 MSK 2013 define('GENERATED_CONFIG_CHECK', 26); -$requred_defines = array('DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?> +$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_SERVER', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'LOG_DESTINATION', 'CONFIG_VERSION'); ?> |