summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-01-30 15:06:23 +0100
committerJoas Schilling <coding@schilljs.com>2017-01-30 15:06:23 +0100
commit0a837ac64eae0a20449d4c00ed07500903728de3 (patch)
tree908b907250622a7ee2daacc8f19a380d16e84540
parent64e9a1aec09bd24fe411e75df710b99dcb67bc86 (diff)
downloadnextcloud-server-0a837ac64eae0a20449d4c00ed07500903728de3.tar.gz
nextcloud-server-0a837ac64eae0a20449d4c00ed07500903728de3.zip
Revert unintentional log timestamp format change
Signed-off-by: Joas Schilling <coding@schilljs.com>
-rw-r--r--lib/private/Console/TimestampFormatter.php4
-rw-r--r--lib/private/Log/File.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php
index d68db95f645..66dd38e6ac3 100644
--- a/lib/private/Console/TimestampFormatter.php
+++ b/lib/private/Console/TimestampFormatter.php
@@ -97,11 +97,11 @@ class TimestampFormatter implements OutputFormatterInterface {
*/
public function format($message) {
- $timeZone = $this->config->getSystemValue('logtimezone', null);
+ $timeZone = $this->config->getSystemValue('logtimezone', 'UTC');
$timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
$time = new \DateTime('now', $timeZone);
- $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ISO8601));
+ $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ATOM));
return $timestampInfo . ' ' . $this->formatter->format($message);
}
diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php
index d41ab83c804..be8b72b3a3f 100644
--- a/lib/private/Log/File.php
+++ b/lib/private/Log/File.php
@@ -75,7 +75,7 @@ class File {
$config = \OC::$server->getSystemConfig();
// default to ISO8601
- $format = $config->getValue('logdateformat', \DateTime::ISO8601);
+ $format = $config->getValue('logdateformat', \DateTime::ATOM);
$logTimeZone = $config->getValue('logtimezone', 'UTC');
try {
$timezone = new \DateTimeZone($logTimeZone);