upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #35614 from nextcloud/fix/errorlog-array-to-string-conversion

Browse source 
Fix array to string conversion in errorlog writer
This commit is contained in:
Côme Chilliet 2022-12-19 14:17:39 +01:00 committed by GitHub
commit 6e22ba832d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/private/Log/Errorlog.php
View file

@ -28,24 +28,27 @@ declare(strict_types=1);
namespace OC\Log;
use OC\SystemConfig;
use OCP\Log\IWriter;
class Errorlog implements IWriter {
class Errorlog extends LogDetails implements IWriter {
/** @var string */
protected $tag;
public function __construct(string $tag = 'nextcloud') {
public function __construct(SystemConfig $config, string $tag = 'nextcloud') {
parent::__construct($config);
$this->tag = $tag;
}
/**
* write a message in the log
* Write a message in the log
*
* @param string $app
* @param string $message
* @param string|array $message
* @param int $level
*/
public function write(string $app, $message, int $level) {
error_log('[' . $this->tag . ']['.$app.']['.$level.'] '.$message);
error_log('[' . $this->tag . ']['.$app.']['.$level.'] '.$this->logDetailsAsJSON($app, $message, $level));
}
}

4
lib/private/Log/LogFactory.php
View file

@ -49,7 +49,7 @@ class LogFactory implements ILogFactory {
public function get(string $type):IWriter {
switch (strtolower($type)) {
case 'errorlog':
return new Errorlog();
return new Errorlog($this->systemConfig);
case 'syslog':
return $this->c->resolve(Syslog::class);
case 'systemd':
@ -73,7 +73,7 @@ class LogFactory implements ILogFactory {
protected function createNewLogger(string $type, string $tag, string $path): IWriter {
switch (strtolower($type)) {
case 'errorlog':
return new Errorlog($tag);
return new Errorlog($this->systemConfig, $tag);
case 'syslog':
return new Syslog($this->systemConfig, $tag);
case 'systemd':

2
lib/private/Log/Syslog.php
View file

@ -53,7 +53,7 @@ class Syslog extends LogDetails implements IWriter {
/**
* write a message in the log
* @param string $app
* @param string $message
* @param string|array $message
* @param int $level
*/
public function write(string $app, $message, int $level) {

2
lib/private/Log/Systemdlog.php
View file

@ -72,7 +72,7 @@ class Systemdlog extends LogDetails implements IWriter {
/**
* Write a message to the log.
* @param string $app
* @param string $message
* @param string|array $message
* @param int $level
*/
public function write(string $app, $message, int $level) {

4
lib/public/Log/IWriter.php
View file

@ -30,6 +30,10 @@ namespace OCP\Log;
interface IWriter {
/**
* @since 14.0.0
*
* @param string $app
* @param string|array $message
* @param int $level
*/
public function write(string $app, $message, int $level);
}