Improve logging

This commit is contained in:
Frederic Guillot
2016-05-07 14:40:49 -04:00
parent 300dabe6b4
commit 6361131d3f
8 changed files with 60 additions and 45 deletions

View File

@@ -6,6 +6,8 @@ use Psr\Log\LogLevel;
use Pimple\Container;
use Pimple\ServiceProviderInterface;
use SimpleLogger\Logger;
use SimpleLogger\Stderr;
use SimpleLogger\Stdout;
use SimpleLogger\Syslog;
use SimpleLogger\File;
@@ -14,19 +16,32 @@ class LoggingProvider implements ServiceProviderInterface
public function register(Container $container)
{
$logger = new Logger;
$driver = null;
if (ENABLE_SYSLOG) {
$syslog = new Syslog('kanboard');
$syslog->setLevel(LogLevel::ERROR);
$logger->setLogger($syslog);
switch (LOG_DRIVER) {
case 'syslog':
$driver = new Syslog('kanboard');
break;
case 'stdout':
$driver = new Stdout();
break;
case 'stderr':
$driver = new Stderr();
break;
case 'file':
$driver = new File(LOG_FILE);
break;
}
if (DEBUG) {
$logger->setLogger(new File(DEBUG_FILE));
if ($driver !== null) {
if (! DEBUG) {
$driver->setLevel(LogLevel::INFO);
}
$logger->setLogger($driver);
}
$container['logger'] = $logger;
return $container;
}
}

View File

@@ -16,8 +16,13 @@ defined('FILES_DIR') or define('FILES_DIR', DATA_DIR.DIRECTORY_SEPARATOR.'files'
defined('PLUGINS_DIR') or define('PLUGINS_DIR', ROOT_DIR.DIRECTORY_SEPARATOR.'plugins');
// Enable/disable debug
defined('DEBUG') or define('DEBUG', getenv('DEBUG'));
defined('DEBUG_FILE') or define('DEBUG_FILE', getenv('DEBUG_FILE') ?: DATA_DIR.DIRECTORY_SEPARATOR.'debug.log');
defined('DEBUG') or define('DEBUG', strtolower(getenv('DEBUG')) === 'true');
// Logging drivers: syslog, stdout, stderr or file
defined('LOG_DRIVER') or define('LOG_DRIVER', getenv('LOG_DRIVER'));
// Logging file
defined('LOG_FILE') or define('LOG_FILE', DATA_DIR.DIRECTORY_SEPARATOR.'debug.log');
// Application version
defined('APP_VERSION') or define('APP_VERSION', build_app_version('$Format:%d$', '$Format:%H$'));
@@ -96,9 +101,6 @@ defined('ENABLE_HSTS') or define('ENABLE_HSTS', true);
// Enable or disable "X-Frame-Options: DENY" HTTP header
defined('ENABLE_XFRAME') or define('ENABLE_XFRAME', true);
// Syslog
defined('ENABLE_SYSLOG') or define('ENABLE_SYSLOG', getenv('ENABLE_SYSLOG'));
// Escape html inside markdown text
defined('MARKDOWN_ESCAPE_HTML') or define('MARKDOWN_ESCAPE_HTML', true);