Changed name of default logfile from owncloud.log to nextcloud.log.

This commit is contained in:
Thomas Pulzer 2016-07-04 11:50:32 +02:00
parent 978ab660f7
commit 90b7f74da7
12 changed files with 19 additions and 19 deletions

View File

@ -16,6 +16,6 @@ PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onf
RESULT=$? RESULT=$?
tail "$/../../../../../data-autotest/owncloud.log" tail "$/../../../../../data-autotest/nextcloud.log"
exit $RESULT exit $RESULT

View File

@ -17,6 +17,6 @@ PYTHONPATH="$SCRIPTPATH/pycalendar/src" python testcaldav.py --print-details-onf
RESULT=$? RESULT=$?
tail "$/../../../../../data-autotest/owncloud.log" tail "$/../../../../../data-autotest/nextcloud.log"
exit $RESULT exit $RESULT

View File

@ -40,7 +40,7 @@ kill $PHPPID
kill $PHPPID_FED kill $PHPPID_FED
if [ -z $HIDE_OC_LOGS ]; then if [ -z $HIDE_OC_LOGS ]; then
tail "../../data/owncloud.log" tail "../../data/nextcloud.log"
fi fi
exit $RESULT exit $RESULT

View File

@ -549,7 +549,7 @@ $CONFIG = array(
*/ */
/** /**
* By default the Nextcloud logs are sent to the ``owncloud.log`` file in the * By default the Nextcloud logs are sent to the ``nextcloud.log`` file in the
* default Nextcloud data directory. * default Nextcloud data directory.
* If syslogging is desired, set this parameter to ``syslog``. * If syslogging is desired, set this parameter to ``syslog``.
* Setting this parameter to ``errorlog`` will use the PHP error_log function * Setting this parameter to ``errorlog`` will use the PHP error_log function
@ -559,9 +559,9 @@ $CONFIG = array(
/** /**
* Log file path for the Nextcloud logging type. * Log file path for the Nextcloud logging type.
* Defaults to ``[datadirectory]/owncloud.log`` * Defaults to ``[datadirectory]/nextcloud.log``
*/ */
'logfile' => '/var/log/owncloud.log', 'logfile' => '/var/log/nextcloud.log',
/** /**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 = * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =

View File

@ -95,7 +95,7 @@ class OwnCloud extends Command {
$output->writeln('Log backend ownCloud: '.$enabledText); $output->writeln('Log backend ownCloud: '.$enabledText);
$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data'); $dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
$defaultLogFile = rtrim($dataDir, '/').'/owncloud.log'; $defaultLogFile = rtrim($dataDir, '/').'/nextcloud.log';
$output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile)); $output->writeln('Log file: '.$this->config->getSystemValue('logfile', $defaultLogFile));
$rotateSize = $this->config->getSystemValue('log_rotate_size', 0); $rotateSize = $this->config->getSystemValue('log_rotate_size', 0);

View File

@ -300,7 +300,7 @@ class Upgrade extends Command {
//Possible scenario: ownCloud core is updated but an app failed //Possible scenario: ownCloud core is updated but an app failed
$output->writeln('<warning>ownCloud is in maintenance mode</warning>'); $output->writeln('<warning>ownCloud is in maintenance mode</warning>');
$output->write('<comment>Maybe an upgrade is already in process. Please check the ' $output->write('<comment>Maybe an upgrade is already in process. Please check the '
. 'logfile (data/owncloud.log). If you want to re-run the ' . 'logfile (data/nextcloud.log). If you want to re-run the '
. 'upgrade procedure, remove the "maintenance mode" from ' . 'upgrade procedure, remove the "maintenance mode" from '
. 'config.php and call this script again.</comment>' . 'config.php and call this script again.</comment>'
, true); , true);

View File

@ -94,7 +94,7 @@ Eventually replace sensitive data as the name/IP-address of your LDAP server or
Insert your webserver log here Insert your webserver log here
``` ```
#### Nextcloud log (data/owncloud.log) #### Nextcloud log (data/nextcloud.log)
``` ```
Insert your Nextcloud log here Insert your Nextcloud log here
``` ```

View File

@ -754,8 +754,8 @@ class OC {
$systemConfig = \OC::$server->getSystemConfig(); $systemConfig = \OC::$server->getSystemConfig();
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) { if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !self::checkUpgrade(false)) {
//don't try to do this before we are properly setup //don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory //use custom logfile path if defined, otherwise use default of nextcloud.log in data directory
\OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/owncloud.log')); \OCP\BackgroundJob::registerJob('OC\Log\Rotate', $systemConfig->getValue('logfile', $systemConfig->getValue('datadirectory', OC::$SERVERROOT . '/data') . '/nextcloud.log'));
} }
} }

View File

@ -33,7 +33,7 @@ namespace OC\Log;
/** /**
* logging utilities * logging utilities
* *
* Log is saved at data/owncloud.log (on default) * Log is saved at data/nextcloud.log (on default)
*/ */
class Owncloud { class Owncloud {
@ -44,7 +44,7 @@ class Owncloud {
*/ */
public static function init() { public static function init() {
$systemConfig = \OC::$server->getSystemConfig(); $systemConfig = \OC::$server->getSystemConfig();
$defaultLogFile = $systemConfig->getValue("datadirectory", \OC::$SERVERROOT.'/data').'/owncloud.log'; $defaultLogFile = $systemConfig->getValue("datadirectory", \OC::$SERVERROOT.'/data').'/nextcloud.log';
self::$logFile = $systemConfig->getValue("logfile", $defaultLogFile); self::$logFile = $systemConfig->getValue("logfile", $defaultLogFile);
/** /**

View File

@ -101,7 +101,7 @@ class OwnCloudTest extends TestCase {
->will($this->returnValueMap([ ->will($this->returnValueMap([
['log_type', 'owncloud', 'log_type_value'], ['log_type', 'owncloud', 'log_type_value'],
['datadirectory', \OC::$SERVERROOT.'/data', '/data/directory/'], ['datadirectory', \OC::$SERVERROOT.'/data', '/data/directory/'],
['logfile', '/data/directory/owncloud.log', '/var/log/owncloud.log'], ['logfile', '/data/directory/nextcloud.log', '/var/log/nextcloud.log'],
['log_rotate_size', 0, 5 * 1024 * 1024], ['log_rotate_size', 0, 5 * 1024 * 1024],
])); ]));
@ -110,7 +110,7 @@ class OwnCloudTest extends TestCase {
->with('Log backend ownCloud: disabled'); ->with('Log backend ownCloud: disabled');
$this->consoleOutput->expects($this->at(1)) $this->consoleOutput->expects($this->at(1))
->method('writeln') ->method('writeln')
->with('Log file: /var/log/owncloud.log'); ->with('Log file: /var/log/nextcloud.log');
$this->consoleOutput->expects($this->at(2)) $this->consoleOutput->expects($this->at(2))
->method('writeln') ->method('writeln')
->with('Rotate at: 5 MB'); ->with('Rotate at: 5 MB');

View File

@ -269,7 +269,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
*/ */
static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) { static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) {
$knownEntries = array( $knownEntries = array(
'owncloud.log' => true, 'nextcloud.log' => true,
'owncloud.db' => true, 'owncloud.db' => true,
'.ocdata' => true, '.ocdata' => true,
'..' => true, '..' => true,

View File

@ -173,8 +173,8 @@ cat $BASEDIR/config/config.php
echo "data directory:" echo "data directory:"
ls -ll $DATADIR ls -ll $DATADIR
echo "owncloud.log:" echo "nextcloud.log:"
[ -f "$DATADIR/owncloud.log" ] && cat $DATADIR/owncloud.log [ -f "$DATADIR/nextcloud.log" ] && cat $DATADIR/nextcloud.log
[ -f "$BASEDIR/data/owncloud.log" ] && cat $BASEDIR/data/owncloud.log [ -f "$BASEDIR/data/nextcloud.log" ] && cat $BASEDIR/data/nextcloud.log
cd $BASEDIR cd $BASEDIR