Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved logger more

Browse source
This commit is contained in:
the-djmaze 2022-10-24 12:28:14 +02:00
parent 7911f9019a
commit 3e3f85aaeb
3 changed files with 22 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

42
snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
View file

@ -25,17 +25,16 @@ class Logger extends \SplFixedArray
private $bShowSecrets = false; private $bShowSecrets = false;
function __construct(bool $bRegPhpErrorHandler = true) function __construct(bool $bMainLogger = false)
{ {
parent::__construct(); parent::__construct();
if ($bRegPhpErrorHandler) if ($bMainLogger)
{ {
\set_error_handler(array($this, '__phpErrorHandler')); \set_error_handler(array($this, '__phpErrorHandler'));
\set_exception_handler(array($this, '__phpExceptionHandler')); \set_exception_handler(array($this, '__phpExceptionHandler'));
\register_shutdown_function(array($this, '__loggerShutDown'));
} }
\register_shutdown_function(array($this, '__loggerShutDown'));
} }
/** /**
@ -67,8 +66,8 @@ class Logger extends \SplFixedArray
public function AddSecret(string $sWord) : void public function AddSecret(string $sWord) : void
{ {
if (\strlen(\trim($sWord))) $sWord = \strlen(\trim($sWord));
{ if ($sWord) {
$this->aSecretWords[] = $sWord; $this->aSecretWords[] = $sWord;
$this->aSecretWords = \array_unique($this->aSecretWords); $this->aSecretWords = \array_unique($this->aSecretWords);
} }
@ -80,7 +79,7 @@ class Logger extends \SplFixedArray
return $this; return $this;
} }
public function IsShowSecter() : bool public function ShowSecrets() : bool
{ {
return $this->bShowSecrets; return $this->bShowSecrets;
} }
@ -182,29 +181,26 @@ class Logger extends \SplFixedArray
} }
/** /**
* @param mixed $oValue * @param mixed $mValue
*/ */
public function WriteDump($oValue, int $iType = \LOG_INFO, string $sName = '', public function WriteDump($mValue, int $iType = \LOG_INFO, string $sName = '') : bool
bool $bSearchSecretWords = false, bool $bDiplayCrLf = false) : bool
{ {
return $this->Write(\print_r($oValue, true), $iType, $sName, $bSearchSecretWords, $bDiplayCrLf); return $this->Write(\print_r($mValue, true), $iType, $sName);
} }
public function WriteException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '', public function WriteException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '') : void
bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
{
if (isset($oException->__LOGINNED__)) {
return true;
}
$oException->__LOGINNED__ = true;
return $this->Write((string) $oException, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
}
public function WriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE) : void
{ {
if (!isset($oException->__LOGINNED__)) { if (!isset($oException->__LOGINNED__)) {
$oException->__LOGINNED__ = true; $oException->__LOGINNED__ = true;
$this->Write($oException->getMessage(), $iType); $this->Write((string) $oException, $iType, $sName);
}
}
public function WriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '') : void
{
if (!isset($oException->__LOGINNED__)) {
$oException->__LOGINNED__ = true;
$this->Write($oException->getMessage(), $iType, $sName);
} }
} }
} }

2
snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
View file

@ -304,7 +304,7 @@ abstract class NetClient
$bFake = \strlen($sFakeRaw); $bFake = \strlen($sFakeRaw);
$sRaw .= "\r\n"; $sRaw .= "\r\n";
if ($this->oLogger && $this->oLogger->IsShowSecter()) if ($this->oLogger && $this->oLogger->ShowSecrets())
{ {
$bFake = false; $bFake = false;
} }

5
snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
View file

@ -51,12 +51,11 @@ abstract class Api
static $oLogger = null; static $oLogger = null;
if (!$oLogger) { if (!$oLogger) {
$oConfig = static::Config(); $oConfig = static::Config();
$oLogger = new \MailSo\Log\Logger; $oLogger = new \MailSo\Log\Logger(true);
$oLogger->SetShowSecrets(!$oConfig->Get('logs', 'hide_passwords', true));
if ($oConfig->Get('debug', 'enable', false)) { if ($oConfig->Get('debug', 'enable', false)) {
$oLogger->SetShowSecrets(!$oConfig->Get('logs', 'hide_passwords', true));
$oLogger->SetLevel(\LOG_DEBUG); $oLogger->SetLevel(\LOG_DEBUG);
} else if ($oConfig->Get('logs', 'enable', false)) { } else if ($oConfig->Get('logs', 'enable', false)) {
$oLogger->SetShowSecrets(!$oConfig->Get('logs', 'hide_passwords', true));
$oLogger->SetLevel(\max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING))); $oLogger->SetLevel(\max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING)));
} }
} }