diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2012-12-16 19:43:32 -0500 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-29 19:30:31 +0000 |
| commit | 7980bccaabcaa27fe9c6db8a49a6e4a8dc4bd3fe (patch) | |
| tree | 99c35b862f7d979ec845e040d5b371a6d84b93b6 /lib | |
| parent | 0229b070c970fce52ee4bbcd4a6387015b453421 (diff) | |
| download | nextcloud-server-7980bccaabcaa27fe9c6db8a49a6e4a8dc4bd3fe.tar.gz nextcloud-server-7980bccaabcaa27fe9c6db8a49a6e4a8dc4bd3fe.zip | |
Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/log/owncloud.php | 15 |
1 files changed, 10 insertions, 5 deletions
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); + } } } |