RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1799 from MPOS/debug-to-logfile

Browse Source 
[IMPROVED] Allow debug console log to logfile
This commit is contained in:
Sebastian Grewe 2014-02-24 11:26:43 +01:00
commit dc1fe9aa35
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/include/autoloader.inc.php
View File

@ -10,9 +10,9 @@ if (empty($config['algorithm']) || $config['algorithm'] == 'scrypt') {
} }
// Default classes // Default classes
require_once(CLASS_DIR . '/debug.class.php');
require_once(INCLUDE_DIR . '/lib/KLogger.php'); require_once(INCLUDE_DIR . '/lib/KLogger.php');
require_once(CLASS_DIR . '/logger.class.php'); require_once(CLASS_DIR . '/logger.class.php');
require_once(CLASS_DIR . '/debug.class.php');
if ($config['mysql_filter']) { if ($config['mysql_filter']) {
require_once(CLASS_DIR . '/strict.class.php'); require_once(CLASS_DIR . '/strict.class.php');
} }

6
public/include/classes/debug.class.php
View File

@ -31,7 +31,8 @@ class Debug {
* @param integer $DEBUG [optional] Enable (>=1) or disable (0) debugging * @param integer $DEBUG [optional] Enable (>=1) or disable (0) debugging
* @return none * @return none
*/ */
function __construct($DEBUG=0) { function __construct($log, $DEBUG=0) {
$this->log = $log;
$this->DEBUG = $DEBUG; $this->DEBUG = $DEBUG;
if ($DEBUG >= 1) { if ($DEBUG >= 1) {
$this->floatStartTime = microtime(true); $this->floatStartTime = microtime(true);
@ -82,6 +83,7 @@ class Debug {
'backtrace' => $this->getBacktrace(), 'backtrace' => $this->getBacktrace(),
'message' => $msg, 'message' => $msg,
); );
$this->log->log("debug", $msg);
} }
} }
@ -108,5 +110,5 @@ class Debug {
} }
// Instantiate this class // Instantiate this class
$debug = new Debug($config['DEBUG']); $debug = new Debug($log, $config['DEBUG']);
?> ?>

5
public/include/classes/logger.class.php
View File

@ -7,15 +7,16 @@ class Logger {
if ($config['logging']['enabled'] && $config['logging']['level'] > 0) { if ($config['logging']['enabled'] && $config['logging']['level'] > 0) {
$this->KLogger = KLogger::instance($config['logging']['path'], $config['logging']['level']); $this->KLogger = KLogger::instance($config['logging']['path'], $config['logging']['level']);
$this->logging = true; $this->logging = true;
$this->floatStartTime = microtime(true);
} }
} }
public function log($strType, $strMessage) { public function log($strType, $strMessage) {
// Logmask, we add some infos into the KLogger // Logmask, we add some infos into the KLogger
$strMask = "[ %12s ] [ %8s | %-8s ] : %s"; $strMask = "[ %12s ] [ %8s | %-8s ] [ %7.7s ] : %s";
$strIPAddress = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown'; $strIPAddress = isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : 'unknown';
$strPage = isset($_REQUEST['page']) ? $_REQUEST['page'] : 'none'; $strPage = isset($_REQUEST['page']) ? $_REQUEST['page'] : 'none';
$strAction = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'none'; $strAction = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'none';
$strMessage = sprintf($strMask, $strIPAddress, $strPage, $strAction, $strMessage); $strMessage = sprintf($strMask, $strIPAddress, $strPage, $strAction, number_format(round((microtime(true) - $this->floatStartTime) * 1000, 2), 2), $strMessage);
if ($this->logging) { if ($this->logging) {
switch ($strType) { switch ($strType) {
case 'emerg': case 'emerg':