Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
6efa7286
Commit
6efa7286
authored
Nov 18, 2015
by
Thomas Müller
Browse files
Merge pull request #20540 from owncloud/fix-format-call-in-logger
Try to fix logging errors we did observe on ci ....
parents
aba11995
6ffd042a
Changes
1
Hide whitespace changes
Inline
Side-by-side
lib/private/log/owncloud.php
View file @
6efa7286
...
...
@@ -66,13 +66,16 @@ class OC_Log_Owncloud {
// default to ISO8601
$format
=
$config
->
getValue
(
'logdateformat'
,
'c'
);
$log
t
ime
z
one
=
$config
->
getValue
(
"logtimezone"
,
'UTC'
);
$log
T
ime
Z
one
=
$config
->
getValue
(
"logtimezone"
,
'UTC'
);
try
{
$timezone
=
new
DateTimeZone
(
$log
t
ime
z
one
);
$timezone
=
new
DateTimeZone
(
$log
T
ime
Z
one
);
}
catch
(
Exception
$e
)
{
$timezone
=
new
DateTimeZone
(
'UTC'
);
}
$time
=
DateTime
::
createFromFormat
(
"U.u"
,
microtime
(
true
),
$timezone
);
if
(
$time
===
false
)
{
$time
=
new
DateTime
(
null
,
$timezone
);
}
$request
=
\
OC
::
$server
->
getRequest
();
$reqId
=
$request
->
getId
();
$remoteAddr
=
$request
->
getRemoteAddress
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment