Merge pull request #523 from Faldon/master

Renamed file logging

3 files changed, 10 insertions, 4 deletions

diff --git a/lib/private/Log.php b/lib/private/Log.php
index 59233cf5c12..0a707f3d4ea 100644
--- a/lib/private/Log.php
+++ b/lib/private/Log.php
@@ -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;
diff --git a/lib/private/Log/Owncloud.php b/lib/private/Log/File.php
index 2cc70015e3c..a406dd83952 100644
--- a/lib/private/Log/Owncloud.php
+++ b/lib/private/Log/File.php
@@ -39,7 +39,7 @@ namespace OC\Log;
  * Log is saved at data/nextcloud.log (on default)
  */
 
-class Owncloud {
+class File {
 	static protected $logFile;
 
 	/**
diff --git a/lib/private/Server.php b/lib/private/Server.php
index 76d6bbad1ef..41092ceae6e 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -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);