diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-01-27 12:08:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-27 12:08:57 +0100 |
| commit | 05884bcd7c80ddd84b945ba6917bdf4a16532b52 (patch) | |
| tree | ae558afb6b053c4289e7567c8fe0ff621e85076f | |
| parent | b5990b740d1208ee3c465fe49ca08d27855c35a6 (diff) | |
| parent | a13ea677ed61bb8f6cc162195b59d03068e884c2 (diff) | |
| download | nextcloud-server-05884bcd7c80ddd84b945ba6917bdf4a16532b52.tar.gz nextcloud-server-05884bcd7c80ddd84b945ba6917bdf4a16532b52.zip | |
Merge pull request #3178 from nextcloud/default-value-logdateformat
fix default value for logdateformat
| -rw-r--r-- | config/config.sample.php | 4 | ||||
| -rw-r--r-- | lib/private/Console/TimestampFormatter.php | 2 | ||||
| -rw-r--r-- | lib/private/Log/File.php | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/config/config.sample.php b/config/config.sample.php index 4f018d189da..a9ab67374f8 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -716,7 +716,9 @@ $CONFIG = array( /** * This uses PHP.date formatting; see http://php.net/manual/en/function.date.php * - * Defaults to ``Y-m-d\TH:i:sO`` (ISO8601) + * Defaults to ``Y-m-d\TH:i:sP`` (ISO8601 but with colon between hours and + * minutes of the timezone) - see \DateTime::ISO8601 + * (https://secure.php.net/manual/en/class.datetime.php#datetime.constants.iso8601) */ 'logdateformat' => 'F d, Y H:i:s', diff --git a/lib/private/Console/TimestampFormatter.php b/lib/private/Console/TimestampFormatter.php index 5b292439a4c..d68db95f645 100644 --- a/lib/private/Console/TimestampFormatter.php +++ b/lib/private/Console/TimestampFormatter.php @@ -101,7 +101,7 @@ class TimestampFormatter implements OutputFormatterInterface { $timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null; $time = new \DateTime('now', $timeZone); - $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', 'c')); + $timestampInfo = $time->format($this->config->getSystemValue('logdateformat', \DateTime::ISO8601)); return $timestampInfo . ' ' . $this->formatter->format($message); } diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 904aa1d93f1..d41ab83c804 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -75,8 +75,8 @@ class File { $config = \OC::$server->getSystemConfig(); // default to ISO8601 - $format = $config->getValue('logdateformat', 'c'); - $logTimeZone = $config->getValue( "logtimezone", 'UTC' ); + $format = $config->getValue('logdateformat', \DateTime::ISO8601); + $logTimeZone = $config->getValue('logtimezone', 'UTC'); try { $timezone = new \DateTimeZone($logTimeZone); } catch (\Exception $e) { |