From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 17 Dec 2012 00:43:32 +0000 (-0500)
Subject: Fall back to default log file if logfile config file not found, suppress writing... 
X-Git-Tag: v5.0.0alpha1~260^2~7
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7980bccaabcaa27fe9c6db8a49a6e4a8dc4bd3fe;p=nextcloud-server.git

Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
---

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index ec43208d833..e53dd5fefcd 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -33,8 +33,11 @@ class OC_Log_Owncloud {
 	 * Init class data
 	 */
 	public static function init() {
-		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-		self::$logFile=OC_Config::getValue( "logfile", $datadir.'/owncloud.log' );
+		$defaultLogFile = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data').'/owncloud.log';
+		self::$logFile = OC_Config::getValue("logfile", $defaultLogFile);
+		if (!file_exists(self::$logFile)) {
+			self::$logFile = $defaultLogFile;
+		}
 	}
 
 	/**
@@ -47,9 +50,11 @@ class OC_Log_Owncloud {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
 			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
-			$fh=fopen(self::$logFile, 'a');
-			fwrite($fh, json_encode($entry)."\n");
-			fclose($fh);
+			$handle = @fopen(self::$logFile, 'a');
+			if ($handle) {
+				fwrite($handle, json_encode($entry)."\n");
+				fclose($handle);
+			}
 		}
 	}