Merge branch 'master' into oc_avatars

Conflicts:
	3rdparty

1 files changed, 16 insertions, 0 deletions

diff --git a/lib/base.php b/lib/base.php
index 0c9fe329b8f..2e6a37c9f4e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -491,6 +491,7 @@ class OC {
 		self::registerCacheHooks();
 		self::registerFilesystemHooks();
 		self::registerShareHooks();
+		self::registerLogRotate();
 
 		//make sure temporary files are cleaned up
 		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
@@ -553,6 +554,21 @@ class OC {
 	}
 
 	/**
+	 * register hooks for the cache
+	 */
+	public static function registerLogRotate() {
+		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false)) {
+			//don't try to do this before we are properly setup
+			// register cache cleanup jobs
+			try { //if this is executed before the upgrade to the new backgroundjob system is completed it will throw an exception
+				\OCP\BackgroundJob::registerJob('OC\Log\Rotate', OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log');
+			} catch (Exception $e) {
+
+			}
+		}
+	}
+
+	/**
 	 * register hooks for the filesystem
 	 */
 	public static function registerFilesystemHooks() {