friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Review Modifications 

make changes based on review.
This commit is contained in:
Adam Magness 2018-10-30 07:59:45 -04:00
parent 80367d05d8
commit 26fbe8dfba
2 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
boot.php
View File

@ -106,20 +106,6 @@ define('SSL_POLICY_FULL', 1);
define('SSL_POLICY_SELFSIGN', 2); define('SSL_POLICY_SELFSIGN', 2);
/* @}*/ /* @}*/
/**
* @name Logger
*
* log levels
* @{
*/
define('LOGGER_WARNING', 0);
define('LOGGER_INFO', 1);
define('LOGGER_TRACE', 2);
define('LOGGER_DEBUG', 3);
define('LOGGER_DATA', 4);
define('LOGGER_ALL', 5);
/* @}*/
/** /**
* @name Register * @name Register
* *

99
src/Core/Logger.php
View File

@ -7,28 +7,39 @@ namespace Friendica\Core;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
class Logger /**
* @brief Logger functions
*/
class Logger extends BaseObject
{ {
// Log levels:
const WARNING = 0;
const INFO = 1;
const TRACE = 2;
const DEBUG = 3;
const DATA = 4;
const ALL = 5;
public static $levels = [];
/**
* @brief Get class constants, and avoid using substring.
*/
public function getConstants()
{
$reflectionClass = new ReflectionClass($this);
return $reflectionClass->getConstants();
}
/** /**
* @brief Logs the given message at the given log level * @brief Logs the given message at the given log level
* *
* log levels:
* LOGGER_WARNING
* LOGGER_INFO (default)
* LOGGER_TRACE
* LOGGER_DEBUG
* LOGGER_DATA
* LOGGER_ALL
*
* @global array $LOGGER_LEVELS
* @param string $msg * @param string $msg
* @param int $level * @param int $level
*/ */
public static function log($msg, $level = LOGGER_INFO) public static function log($msg, $level = INFO)
{ {
$a = get_app(); $a = self::getApp();
global $LOGGER_LEVELS;
$LOGGER_LEVELS = [];
$debugging = Config::get('system', 'debugging'); $debugging = Config::get('system', 'debugging');
$logfile = Config::get('system', 'logfile'); $logfile = Config::get('system', 'logfile');
@ -42,18 +53,19 @@ class Logger
return; return;
} }
if (count($LOGGER_LEVELS) == 0) { if (count($levels) == 0)
foreach (get_defined_constants() as $k => $v) { {
if (substr($k, 0, 7) == "LOGGER_") { foreach (self::getConstants() as $k => $v)
$LOGGER_LEVELS[$v] = substr($k, 7, 7); {
} $levels[$v] = $k;
} }
} }
$process_id = session_id(); $processId = session_id();
if ($process_id == '') { if ($processId == '')
$process_id = get_app()->process_id; {
$processId = $a->process_id;
} }
$callers = debug_backtrace(); $callers = debug_backtrace();
@ -66,8 +78,8 @@ class Logger
$logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n", $logline = sprintf("%s@%s\t[%s]:%s:%s:%s\t%s\n",
DateTimeFormat::utcNow(DateTimeFormat::ATOM), DateTimeFormat::utcNow(DateTimeFormat::ATOM),
$process_id, $processId,
$LOGGER_LEVELS[$level], $levels[$level],
basename($callers[0]['file']), basename($callers[0]['file']),
$callers[0]['line'], $callers[0]['line'],
$function, $function,
@ -85,50 +97,45 @@ class Logger
* to isolate particular elements they are targetting * to isolate particular elements they are targetting
* personally without background noise * personally without background noise
* *
* log levels:
* LOGGER_WARNING
* LOGGER_INFO (default)
* LOGGER_TRACE
* LOGGER_DEBUG
* LOGGER_DATA
* LOGGER_ALL
*
* @global array $LOGGER_LEVELS
* @param string $msg * @param string $msg
* @param int $level * @param int $level
*/ */
public static function devLog($msg, $level = LOGGER_INFO) public static function devLog($msg, $level = INFO)
{ {
$a = get_app(); $a = self::getApp();
$logfile = Config::get('system', 'dlogfile'); $logfile = Config::get('system', 'dlogfile');
if (!$logfile) { if (!$logfile) {
return; return;
} }
$dlogip = Config::get('system', 'dlogip'); $dlogip = Config::get('system', 'dlogip');
if (!is_null($dlogip) && $_SERVER['REMOTE_ADDR'] != $dlogip) {
if (!is_null($dlogip) && $_SERVER['REMOTE_ADDR'] != $dlogip)
{
return; return;
} }
if (count($LOGGER_LEVELS) == 0) { if (count($levels) == 0)
foreach (get_defined_constants() as $k => $v) { {
if (substr($k, 0, 7) == "LOGGER_") { foreach (self::getConstants() as $k => $v)
$LOGGER_LEVELS[$v] = substr($k, 7, 7); {
} $levels[$v] = $k;
} }
} }
$process_id = session_id(); $processId = session_id();
if ($process_id == '') { if ($processId == '')
$process_id = $a->process_id; {
$processId = $a->process_id;
} }
$callers = debug_backtrace(); $callers = debug_backtrace();
$logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n", $logline = sprintf("%s@\t%s:\t%s:\t%s\t%s\t%s\n",
DateTimeFormat::utcNow(), DateTimeFormat::utcNow(),
$process_id, $processId,
basename($callers[0]['file']), basename($callers[0]['file']),
$callers[0]['line'], $callers[0]['line'],
$callers[1]['function'], $callers[1]['function'],
@ -139,4 +146,4 @@ class Logger
@file_put_contents($logfile, $logline, FILE_APPEND); @file_put_contents($logfile, $logline, FILE_APPEND);
$a->saveTimestamp($stamp1, "file"); $a->saveTimestamp($stamp1, "file");
} }
} }