Skip to content
Snippets Groups Projects
Commit 3e7b2810 authored by Phiber2000's avatar Phiber2000 Committed by Thomas Müller
Browse files

fix broken logtimezone

parent 2934b7e6
No related branches found
No related tags found
No related merge requests found
...@@ -76,9 +76,12 @@ class OC_Log_Owncloud { ...@@ -76,9 +76,12 @@ class OC_Log_Owncloud {
} catch (Exception $e) { } catch (Exception $e) {
$timezone = new DateTimeZone('UTC'); $timezone = new DateTimeZone('UTC');
} }
$time = DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""), $timezone); $time = DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
if ($time === false) { if ($time === false) {
$time = new DateTime(null, $timezone); $time = new DateTime(null, $timezone);
} else {
// apply timezone if $time is created from UNIX timestamp
$time->setTimezone($timezone);
} }
$request = \OC::$server->getRequest(); $request = \OC::$server->getRequest();
$reqId = $request->getId(); $reqId = $request->getId();
...@@ -90,8 +93,7 @@ class OC_Log_Owncloud { ...@@ -90,8 +93,7 @@ class OC_Log_Owncloud {
$url = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '--'; $url = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '--';
$method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : '--'; $method = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : '--';
$entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time', 'method', 'url'); $entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time', 'method', 'url');
} } else {
else {
$entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time'); $entry = compact('reqId', 'remoteAddr', 'app', 'message', 'level', 'time');
} }
$entry = json_encode($entry); $entry = json_encode($entry);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment