Merge pull request #523 from Faldon/master

Renamed file logging
This commit is contained in:
Joas Schilling 2016-07-25 11:41:24 +02:00 committed by GitHub
commit 4ad0c383ad
12 changed files with 42 additions and 33 deletions

View File

@ -569,7 +569,7 @@ $CONFIG = array(
* Setting this parameter to ``errorlog`` will use the PHP error_log function
* for logging.
*/
'log_type' => 'owncloud',
'log_type' => 'file',
/**
* Log file path for the Nextcloud logging type.

View File

@ -31,7 +31,7 @@ use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
class OwnCloud extends Command {
class File extends Command {
/** @var IConfig */
protected $config;
@ -43,8 +43,8 @@ class OwnCloud extends Command {
protected function configure() {
$this
->setName('log:owncloud')
->setDescription('manipulate ownCloud logging backend')
->setName('log:file')
->setDescription('manipulate logging backend')
->addOption(
'enable',
null,
@ -70,7 +70,7 @@ class OwnCloud extends Command {
$toBeSet = [];
if ($input->getOption('enable')) {
$toBeSet['log_type'] = 'owncloud';
$toBeSet['log_type'] = 'file';
}
if ($file = $input->getOption('file')) {
@ -89,12 +89,14 @@ class OwnCloud extends Command {
}
// display config
if ($this->config->getSystemValue('log_type', 'owncloud') === 'owncloud') {
// TODO: Drop backwards compatibility for config in the future
$logType = $this->config->getSystemValue('log_type', 'file');
if ($logType === 'file' || $logType === 'owncloud') {
$enabledText = 'enabled';
} else {
$enabledText = 'disabled';
}
$output->writeln('Log backend ownCloud: '.$enabledText);
$output->writeln('Log backend file: '.$enabledText);
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
$defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';

View File

@ -34,7 +34,7 @@ use Symfony\Component\Console\Output\OutputInterface;
class Manage extends Command {
const DEFAULT_BACKEND = 'owncloud';
const DEFAULT_BACKEND = 'file';
const DEFAULT_LOG_LEVEL = 2;
const DEFAULT_TIMEZONE = 'UTC';
@ -54,7 +54,7 @@ class Manage extends Command {
'backend',
null,
InputOption::VALUE_REQUIRED,
'set the logging backend [owncloud, syslog, errorlog]'
'set the logging backend [file, syslog, errorlog]'
)
->addOption(
'level',

View File

@ -99,7 +99,7 @@ if (\OC::$server->getConfig()->getSystemValue('installed', false)) {
);
$application->add(new OC\Core\Command\Log\Manage(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Log\OwnCloud(\OC::$server->getConfig()));
$application->add(new OC\Core\Command\Log\File(\OC::$server->getConfig()));
$view = new \OC\Files\View();
$util = new \OC\Encryption\Util(

View File

@ -103,7 +103,12 @@ class Log implements ILogger {
// FIXME: Add this for backwards compatibility, should be fixed at some point probably
if($logger === null) {
$this->logger = 'OC\\Log\\'.ucfirst($this->config->getValue('log_type', 'owncloud'));
// TODO: Drop backwards compatibility for config in the future
$logType = $this->config->getValue('log_type', 'file');
if($logType==='owncloud') {
$logType = 'file';
}
$this->logger = 'OC\\Log\\'.ucfirst($logType);
call_user_func(array($this->logger, 'init'));
} else {
$this->logger = $logger;

View File

@ -39,7 +39,7 @@ namespace OC\Log;
* Log is saved at data/nextcloud.log (on default)
*/
class Owncloud {
class File {
static protected $logFile;
/**

View File

@ -364,8 +364,9 @@ class Server extends ServerContainer implements IServerContainer {
);
});
$this->registerService('Logger', function (Server $c) {
$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
$logger = 'OC\\Log\\' . ucfirst($logClass);
$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'file');
// TODO: Drop backwards compatibility for config in the future
$logger = 'OC\\Log\\' . ucfirst($logClass=='owncloud' ? 'file' : $logClass);
call_user_func(array($logger, 'init'));
return new Log($logger);

View File

@ -93,8 +93,8 @@ class LogSettingsController extends Controller {
*/
public function getEntries($count=50, $offset=0) {
return new JSONResponse([
'data' => \OC\Log\Owncloud::getEntries($count, $offset),
'remain' => count(\OC\Log\Owncloud::getEntries(1, $offset + $count)) !== 0,
'data' => \OC\Log\File::getEntries($count, $offset),
'remain' => count(\OC\Log\File::getEntries(1, $offset + $count)) !== 0,
]);
}
@ -106,7 +106,7 @@ class LogSettingsController extends Controller {
* @return StreamResponse
*/
public function download() {
$resp = new StreamResponse(\OC\Log\Owncloud::getLogFilePath());
$resp = new StreamResponse(\OC\Log\File::getLogFilePath());
$resp->addHeader('Content-Type', 'application/octet-stream');
$resp->addHeader('Content-Disposition', 'attachment; filename="nextcloud.log"');
return $resp;

View File

@ -44,12 +44,13 @@ OC_Util::addScript('files', 'jquery.fileupload');
\OC::$server->getEventDispatcher()->dispatch('OC\Settings\Admin::loadAdditionalScripts');
$showLog = (\OC::$server->getConfig()->getSystemValue('log_type', 'owncloud') === 'owncloud');
$logType = \OC::$server->getConfig()->getSystemValue('log_type', 'file');
$showLog = ($logType === 'file' || $logType === 'owncloud');
$numEntriesToLoad = 3;
$entries = \OC\Log\Owncloud::getEntries($numEntriesToLoad + 1);
$entries = \OC\Log\File::getEntries($numEntriesToLoad + 1);
$entriesRemaining = count($entries) > $numEntriesToLoad;
$entries = array_slice($entries, 0, $numEntriesToLoad);
$logFilePath = \OC\Log\Owncloud::getLogFilePath();
$logFilePath = \OC\Log\File::getLogFilePath();
$doesLogFileExist = file_exists($logFilePath);
$logFileSize = 0;
if($doesLogFileExist) {

View File

@ -22,10 +22,10 @@
namespace Tests\Core\Command\Log;
use OC\Core\Command\Log\OwnCloud;
use OC\Core\Command\Log\File;
use Test\TestCase;
class OwnCloudTest extends TestCase {
class FileTest extends TestCase {
/** @var \PHPUnit_Framework_MockObject_MockObject */
protected $config;
/** @var \PHPUnit_Framework_MockObject_MockObject */
@ -45,7 +45,7 @@ class OwnCloudTest extends TestCase {
$this->consoleInput = $this->getMock('Symfony\Component\Console\Input\InputInterface');
$this->consoleOutput = $this->getMock('Symfony\Component\Console\Output\OutputInterface');
$this->command = new OwnCloud($config);
$this->command = new File($config);
}
public function testEnable() {
@ -55,7 +55,7 @@ class OwnCloudTest extends TestCase {
]));
$this->config->expects($this->once())
->method('setSystemValue')
->with('log_type', 'owncloud');
->with('log_type', 'file');
self::invokePrivate($this->command, 'execute', [$this->consoleInput, $this->consoleOutput]);
}
@ -99,7 +99,7 @@ class OwnCloudTest extends TestCase {
public function testGetConfiguration() {
$this->config->method('getSystemValue')
->will($this->returnValueMap([
['log_type', 'owncloud', 'log_type_value'],
['log_type', 'file', 'log_type_value'],
['datadirectory', \OC::$SERVERROOT.'/data', '/data/directory/'],
['logfile', '/data/directory/nextcloud.log', '/var/log/nextcloud.log'],
['log_rotate_size', 0, 5 * 1024 * 1024],
@ -107,7 +107,7 @@ class OwnCloudTest extends TestCase {
$this->consoleOutput->expects($this->at(0))
->method('writeln')
->with('Log backend ownCloud: disabled');
->with('Log backend file: disabled');
$this->consoleOutput->expects($this->at(1))
->method('writeln')
->with('Log file: /var/log/nextcloud.log');

View File

@ -154,7 +154,7 @@ class ManageTest extends TestCase {
public function testGetConfiguration() {
$this->config->expects($this->at(0))
->method('getSystemValue')
->with('log_type', 'owncloud')
->with('log_type', 'file')
->willReturn('log_type_value');
$this->config->expects($this->at(1))
->method('getSystemValue')

View File

@ -17,15 +17,15 @@
namespace Test\Log;
use OC\Log\Owncloud;
use OC\Log\File;
use Test\TestCase;
/**
* Class OwncloudTest
* Class FileTest
*
* @group DB
*/
class OwncloudTest extends TestCase
class FileTest extends TestCase
{
private $restore_logfile;
private $restore_logdateformat;
@ -37,7 +37,7 @@ class OwncloudTest extends TestCase
$this->restore_logdateformat = $config->getSystemValue('logdateformat');
$config->setSystemValue("logfile", $config->getSystemValue('datadirectory') . "/logtest");
Owncloud::init();
File::init();
}
protected function tearDown() {
$config = \OC::$server->getConfig();
@ -51,7 +51,7 @@ class OwncloudTest extends TestCase
} else {
$config->deleteSystemValue("restore_logdateformat");
}
Owncloud::init();
File::init();
parent::tearDown();
}
@ -62,7 +62,7 @@ class OwncloudTest extends TestCase
# set format & write log line
$config->setSystemValue('logdateformat', 'u');
Owncloud::write('test', 'message', \OCP\Util::ERROR);
File::write('test', 'message', \OCP\Util::ERROR);
# read log line
$handle = @fopen($config->getSystemValue('logfile'), 'r');