mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

backport of #23222 (#23225)

This commit is contained in:
Phiber2000 2016-03-14 17:59:40 +01:00
parent cf232c4182
commit e2c557ab82
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/log/owncloud.php
View File

@ -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 {
$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);