diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-04-13 13:11:47 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 13:11:47 -0500 |
| commit | d0c0f6cfc1871c90cd43d3b005206a360b5bb540 (patch) | |
| tree | 969ae0b270e947b2b65c6403a9cc60fd873cef9d | |
| parent | 81d3732bf51590ca3e3b8abc794d9562346862f5 (diff) | |
| parent | 695696a4a636d98b108bddb72463b46d98b95bef (diff) | |
| download | nextcloud-server-d0c0f6cfc1871c90cd43d3b005206a360b5bb540.tar.gz nextcloud-server-d0c0f6cfc1871c90cd43d3b005206a360b5bb540.zip | |
Merge pull request #4326 from nextcloud/downstream-27562
Reorder the entries of the log for easier reading
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 3 | ||||
| -rw-r--r-- | lib/private/Log/File.php | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 3f1e6fd951a..b39ae3e8c0c 100644 --- a/lib/private/AppFramework/Http/Request.php +++ b/lib/private/AppFramework/Http/Request.php @@ -578,7 +578,8 @@ class Request implements \ArrayAccess, \Countable, IRequest { } if(empty($this->requestId)) { - $this->requestId = $this->secureRandom->generate(20); + $validChars = ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS; + $this->requestId = $this->secureRandom->generate(20, $validChars); } return $this->requestId; diff --git a/lib/private/Log/File.php b/lib/private/Log/File.php index 8011f63ab13..97ec5012b1f 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -106,14 +106,14 @@ class File { $version = $config->getValue('version', ''); $entry = compact( 'reqId', - 'remoteAddr', - 'app', - 'message', 'level', 'time', + 'remoteAddr', + 'user', + 'app', 'method', 'url', - 'user', + 'message', 'userAgent', 'version' ); |