maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'logging' of https://github.com/nachtgeist/Froxlor into nachtgeist-logging

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2016-02-17 08:41:17 +01:00
parent 8d56478187 a68effe4e7
commit 7b29d43c66
25 changed files with 153 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
lib/classes/logger/class.FroxlorLogger.php
View File

@@ -105,34 +105,12 @@ class FroxlorLogger {
}
if (self::$crondebug_flag) {
switch($type) {
case LOG_INFO:
$_type = 'information';
break;
case LOG_NOTICE:
$_type = 'notice';
break;
case LOG_WARNING:
$_type = 'warning';
break;
case LOG_ERR:
$_type = 'error';
break;
case LOG_CRIT:
$_type = 'critical';
break;
case LOG_DEBUG:
$_type = 'debug';
break;
default:
$_type = 'unknown';
break;
}
echo "[".$_type."] ".$text.PHP_EOL;
echo "[".getLogLevelDesc($type)."] ".$text.PHP_EOL;
}
if (Settings::Get('logger.log_cron') == '0'
&& $action == CRON_ACTION
&& $type > 4 // warnings, errors and critical mesages WILL be logged
) {
return;
}
@@ -191,13 +169,11 @@ class FroxlorLogger {
$_cronlog = (int)$_cronlog;
if ($_cronlog != 0
&& $_cronlog != 1
) {
if ($_cronlog < 0 || $_cronlog > 2) {
$_cronlog = 0;
}
Settings::Set('logger.log_cron', $_cronlog);
return true;
return $_cronlog;
}
/**

4
lib/classes/logger/class.SysLogger.php
View File

@@ -114,9 +114,9 @@ class SysLogger extends AbstractLogger {
if ($text != null
&& $text != ''
) {
syslog((int)$type, "[" . ucfirst($_action) . " Action " . $name . "] " . $text);
syslog((int)$type, "[" . ucfirst($_action) . " Action " . $name . "] [".getLogLevelDesc($type)."] " . $text);
} else {
syslog((int)$type, "[" . ucfirst($_action) . " Action " . $name . "] No text given!!! Check scripts!");
syslog((int)$type, "[" . ucfirst($_action) . " Action " . $name . "] [".getLogLevelDesc($type)."] No text given!!! Check scripts!");
}
closelog();

44
lib/functions/logger/function.getLogLevelDesc.php Normal file
View File

@@ -0,0 +1,44 @@
<?php
/**
* This file is part of the Froxlor project.
* Copyright (c) 2010 the Froxlor Team (see authors).
*
* For the full copyright and license information, please view the COPYING
* file that was distributed with this source code. You can also view the
* COPYING file online at http://files.froxlor.org/misc/COPYING.txt
*
* @copyright (c) the authors
* @author Michael Kaufmann <mkaufmann@nutime.de>
* @author Daniel Reichelt <hacking@nachtgeist.net> (2016-)
* @license GPLv2 http://files.froxlor.org/misc/COPYING.txt
* @package Functions
*
*/
function getLogLevelDesc($type) {
switch($type) {
case LOG_INFO:
$_type = 'information';
break;
case LOG_NOTICE:
$_type = 'notice';
break;
case LOG_WARNING:
$_type = 'warning';
break;
case LOG_ERR:
$_type = 'error';
break;
case LOG_CRIT:
$_type = 'critical';
break;
case LOG_DEBUG:
$_type = 'debug';
break;
default:
$_type = 'unknown';
break;
}
return $_type;
}

2
lib/version.inc.php
View File

@@ -16,7 +16,7 @@
*/
// Main version variable
$version = '0.9.35-dev3';
$version = '0.9.35-dev4';
// Database version (unused, old stuff from SysCP)
$dbversion = '2';