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

Log more for #1080

Browse source
This commit is contained in:
the-djmaze 2023-05-15 15:16:10 +02:00
parent ffde5ddfb3
commit a2ca00e3e8
1 changed files with 66 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,14 +25,59 @@ class Logger extends \SplFixedArray
private bool $bShowSecrets = false; private bool $bShowSecrets = false;
private static $SIGNALS = [
'SIGABRT',
'SIGALRM',
'SIGBABY',
'SIGBUS',
'SIGCHLD',
'SIGCLD',
'SIGCONT',
'SIGFPE',
'SIGHUP',
'SIGILL',
// 'SIGINT',
'SIGIO',
'SIGIOT',
'SIGKILL',
'SIGPIPE',
'SIGPOLL',
'SIGPROF',
'SIGPWR',
'SIGQUIT',
'SIGSEGV',
'SIGSTKFLT',
'SIGSTOP',
'SIGSYS',
'SIGTERM',
'SIGTRAP',
'SIGTSTP',
'SIGTTIN',
'SIGTTOU',
'SIGURG',
'SIGUSR1',
'SIGUSR2',
'SIGVTALRM',
'SIGWINCH',
'SIGXCPU',
'SIGXFSZ'
];
function __construct(bool $bMainLogger = false) function __construct(bool $bMainLogger = false)
{ {
parent::__construct(); parent::__construct();
if ($bMainLogger) { if ($bMainLogger) {
\set_error_handler(array($this, '__phpErrorHandler')); \set_error_handler([$this, '__phpErrorHandler']);
\set_exception_handler(array($this, '__phpExceptionHandler')); \set_exception_handler([$this, '__phpExceptionHandler']);
\register_shutdown_function(array($this, '__loggerShutDown')); \register_shutdown_function([$this, '__loggerShutDown']);
if (\is_callable('pcntl_signal')) {
\pcntl_async_signals(true);
foreach (static::$SIGNALS as $SIGNAL) {
\pcntl_signal(\constant($SIGNAL), [$this, 'signalHandler']);
}
}
} }
} }
@ -150,11 +195,28 @@ class Logger extends \SplFixedArray
public function __loggerShutDown() : void public function __loggerShutDown() : void
{ {
if ($this->bUsed) { if ($this->bUsed) {
$error = \error_get_last();
$error && $this->Write('Last error: '.\json_encode($error));
$this->Write('Memory peak usage: '.\MailSo\Base\Utils::FormatFileSize(\memory_get_peak_usage(true), 2)); $this->Write('Memory peak usage: '.\MailSo\Base\Utils::FormatFileSize(\memory_get_peak_usage(true), 2));
$this->Write('Time delta: '.(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'])); $this->Write('Time delta: '.(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']));
} }
} }
public function signalHandler($signo)
{
if (\SIGTERM == $signo) {
exit;
}
if ($this->bUsed) {
foreach (static::$SIGNALS as $SIGNAL) {
if (\constant($SIGNAL) == $signo) {
$this->Write("Caught {$SIGNAL}");
break;
}
}
}
}
public function Write(string $sDesc, int $iType = \LOG_INFO, public function Write(string $sDesc, int $iType = \LOG_INFO,
string $sName = '', bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool string $sName = '', bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
{ {
@ -164,8 +226,7 @@ class Logger extends \SplFixedArray
$this->bUsed = true; $this->bUsed = true;
if ($bSearchSecretWords && !$this->bShowSecrets && $this->aSecretWords) if ($bSearchSecretWords && !$this->bShowSecrets && $this->aSecretWords) {
{
$sDesc = \str_replace($this->aSecretWords, '*******', $sDesc); $sDesc = \str_replace($this->aSecretWords, '*******', $sDesc);
} }