diff options
| -rw-r--r-- | lib/base.php | 8 | ||||
| -rw-r--r-- | lib/private/log/owncloud.php | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/lib/base.php b/lib/base.php index d4400dcf69c..4744491141e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -304,12 +304,8 @@ class OC { self::$session = new \OC\Session\Internal(OC_Util::getInstanceId()); // if session cant be started break with http 500 error } catch (Exception $e) { - if(!OC_Config::getValue('installed')) { - error_log('Session could not be initialized'); - } else { - OC_Log::write('core', 'Session could not be initialized', - OC_Log::ERROR); - } + OC_Log::write('core', 'Session could not be initialized', + OC_Log::ERROR); header('HTTP/1.1 500 Internal Server Error'); OC_Util::addStyle("styles"); $error = 'Session could not be initialized. Please contact your '; diff --git a/lib/private/log/owncloud.php b/lib/private/log/owncloud.php index f3b43584409..a408e3830d6 100644 --- a/lib/private/log/owncloud.php +++ b/lib/private/log/owncloud.php @@ -59,10 +59,14 @@ class OC_Log_Owncloud { } $time = new DateTime(null, $timezone); $entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=> $time->format($format)); + $entry = json_encode($entry); $handle = @fopen(self::$logFile, 'a'); if ($handle) { - fwrite($handle, json_encode($entry)."\n"); + fwrite($handle, $entry."\n"); fclose($handle); + } else { + // Fall back to error_log + error_log($entry); } } } |