From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 30 Mar 2012 21:40:16 +0000 (+0200)
Subject: Move logfile determination to init function
X-Git-Tag: v4.0.0beta~392^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=20fc23c82bbcaff56caafe6a6cc0ef15db9b2bf8;p=nextcloud-server.git

Move logfile determination to init function
---

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 6df346e9b17..5e143205563 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -27,10 +27,14 @@
  */
 
 class OC_Log_Owncloud {
+	static protected $logFile;
+
 	/**
 	 * Init class data
 	 */
 	public static function init() {
+		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
+		self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
 	}
 
 	/**
@@ -42,10 +46,8 @@ class OC_Log_Owncloud {
 	public static function write($app, $message, $level) {
 		$minLevel=OC_Config::getValue( "loglevel", 2 );
 		if($level>=$minLevel){
-			$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-			$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
 			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level,'time'=>time());
-			$fh=fopen($logFile, 'a');
+			$fh=fopen(self::$logFile, 'a');
 			fwrite($fh, json_encode($entry)."\n");
 			fclose($fh);
 		}
@@ -58,10 +60,9 @@ class OC_Log_Owncloud {
 	 * @return array
 	 */
 	public static function getEntries($limit=50, $offset=0){
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-		$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
+		self::init();
 		$entries=array();
-		if(!file_exists($logFile)) {
+		if(!file_exists(self::$logFile)) {
 			return array();
 		}
 		$contents=file($logFile);