the-djmaze 2023-02-20 14:21:49 +01:00
parent 8a63ae05ef
commit b8b7f10055
4 changed files with 38 additions and 14 deletions

View file

@ -23,11 +23,7 @@ class File extends \MailSo\Log\Driver
function __construct(string $sLoggerFileName) function __construct(string $sLoggerFileName)
{ {
parent::__construct(); parent::__construct();
$this->SetLoggerFileName($sLoggerFileName);
}
public function SetLoggerFileName(string $sLoggerFileName)
{
$sLogFileDir = \dirname($sLoggerFileName); $sLogFileDir = \dirname($sLoggerFileName);
if (!\is_dir($sLogFileDir)) { if (!\is_dir($sLogFileDir)) {
\mkdir($sLogFileDir, 0755, true); \mkdir($sLogFileDir, 0755, true);
@ -37,19 +33,14 @@ class File extends \MailSo\Log\Driver
protected function writeImplementation($mDesc) : bool protected function writeImplementation($mDesc) : bool
{ {
return $this->writeToLogFile($mDesc); if (\is_array($mDesc)) {
$mDesc = \implode("\n\t", $mDesc);
}
return \error_log($mDesc . "\n", 3, $this->sLoggerFileName);
} }
protected function clearImplementation() : bool protected function clearImplementation() : bool
{ {
return \unlink($this->sLoggerFileName); return \unlink($this->sLoggerFileName);
} }
private function writeToLogFile($mDesc) : bool
{
if (\is_array($mDesc)) {
$mDesc = \implode("\n\t", $mDesc);
}
return \error_log($mDesc . "\n", 3, $this->sLoggerFileName);
}
} }

View file

@ -0,0 +1,30 @@
<?php
/*
* This file is part of MailSo.
*
* (c) 2023 DJMaze
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace MailSo\Log\Drivers;
/**
* @category MailSo
* @package Log
* @subpackage Drivers
*/
class StderrStream extends \MailSo\Log\Driver
{
protected function writeImplementation($mDesc) : bool
{
return 0 < \fwrite(STDERR, $mDesc . "\n");
}
protected function clearImplementation() : bool
{
return true;
}
}

View file

@ -127,6 +127,8 @@ class Actions
$sLogFileName = $this->oConfig->Get('logs', 'filename', ''); $sLogFileName = $this->oConfig->Get('logs', 'filename', '');
if ('syslog' === $sLogFileName) { if ('syslog' === $sLogFileName) {
$oDriver = new \MailSo\Log\Drivers\Syslog(); $oDriver = new \MailSo\Log\Drivers\Syslog();
} else if ('stderr' === $sLogFileName) {
$oDriver = new \MailSo\Log\Drivers\StderrStream();
} else { } else {
$sLogFileFullPath = \trim($this->oConfig->Get('logs', 'path', '')) ?: \APP_PRIVATE_DATA . 'logs'; $sLogFileFullPath = \trim($this->oConfig->Get('logs', 'path', '')) ?: \APP_PRIVATE_DATA . 'logs';
\is_dir($sLogFileFullPath) || \mkdir($sLogFileFullPath, 0700, true); \is_dir($sLogFileFullPath) || \mkdir($sLogFileFullPath, 0700, true);

View file

@ -340,7 +340,8 @@ Examples:
filename = "log-{date:Y-m-d}.txt" filename = "log-{date:Y-m-d}.txt"
filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log" filename = "{date:Y-m-d}/{user:domain}/{user:email}_{user:uid}.log"
filename = "{user:email}-{date:Y-m-d}.txt" filename = "{user:email}-{date:Y-m-d}.txt"
filename = "syslog"'), filename = "syslog"
filename = "stderr"'),
'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'), 'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'), 'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),