mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8282 from Cybso/config-logfilemode 

Make logfile's mode configurable.
This commit is contained in:
Morris Jobke 2018-10-02 20:28:01 +02:00 committed by GitHub
parent 4de134385f 7005ff420e
commit 00569a0173
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/config.sample.php
View File

@ -728,6 +728,13 @@ $CONFIG = array(
*/
'logfile' => '/var/log/nextcloud.log',
/**
* Log file mode for the Nextcloud loggin type in octal notation.
*
* Defaults to 0640 (writeable by user, readable by group).
*/
'logfilemode' => 0640,
/**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
* Warning, 3 = Error, and 4 = Fatal. The default value is Warning.

7
lib/private/Log/File.php
View File

@ -50,6 +50,8 @@ use OCP\ILogger;
class File implements IWriter, IFileBased {
/** @var string */
protected $logFile;
/** @var int */
protected $logFileMode;
/** @var SystemConfig */
private $config;
@ -67,6 +69,7 @@ class File implements IWriter, IFileBased {
}
}
$this->config = $config;
$this->logFileMode = $config->getValue('logfilemode', 0640);
}
/**
@ -134,8 +137,8 @@ class File implements IWriter, IFileBased {
}
$entry = json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
$handle = @fopen($this->logFile, 'a');
if ((fileperms($this->logFile) & 0777) != 0640) {
@chmod($this->logFile, 0640);
if ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) {
@chmod($this->logFile, $this->logFileMode);
}
if ($handle) {
fwrite($handle, $entry."\n");

12
tests/lib/Log/LogFactoryTest.php
View File

@ -83,10 +83,10 @@ class LogFactoryTest extends TestCase {
$datadir = \OC::$SERVERROOT.'/data';
$defaultLog = $datadir . '/nextcloud.log';
$this->systemConfig->expects($this->exactly(2))
$this->systemConfig->expects($this->exactly(3))
->method('getValue')
->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog])
->willReturnOnConsecutiveCalls($datadir, $defaultLog);
->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog], ['logfilemode', 0640])
->willReturnOnConsecutiveCalls($datadir, $defaultLog, 0640);
$log = $this->factory->get($type);
$this->assertInstanceOf(File::class, $log);
@ -113,10 +113,10 @@ class LogFactoryTest extends TestCase {
$datadir = \OC::$SERVERROOT.'/data';
$defaultLog = $datadir . '/nextcloud.log';
$this->systemConfig->expects($this->exactly(2))
$this->systemConfig->expects($this->exactly(3))
->method('getValue')
->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog])
->willReturnOnConsecutiveCalls($datadir, $path);
->withConsecutive(['datadirectory', $datadir], ['logfile', $defaultLog], ['logfilemode', 0640])
->willReturnOnConsecutiveCalls($datadir, $path, 0640);
$log = $this->factory->get('file');
$this->assertInstanceOf(File::class, $log);