diff options
| author | Juan Pablo Villafáñez <jvillafanez@solidgear.es> | 2017-04-04 10:12:41 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2017-04-12 13:03:19 +0200 |
| commit | 38e5135cb9730a5add715aa8e0b532a2aeb1835e (patch) | |
| tree | b62a87bb233dabd886e6dbe2fe005411b2f8620b /lib | |
| parent | af42ca20252b166bec2da34970137ec790a18328 (diff) | |
| download | nextcloud-server-38e5135cb9730a5add715aa8e0b532a2aeb1835e.tar.gz nextcloud-server-38e5135cb9730a5add715aa8e0b532a2aeb1835e.zip | |
Reorder the entries of the log for easier reading
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/AppFramework/Http/Request.php | 3 | ||||
| -rw-r--r-- | lib/private/Log/File.php | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/private/AppFramework/Http/Request.php b/lib/private/AppFramework/Http/Request.php index 3f1e6fd951a..c6ef5169ddb 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 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'; + $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..9ef071bee5f 100644 --- a/lib/private/Log/File.php +++ b/lib/private/Log/File.php @@ -106,16 +106,16 @@ class File { $version = $config->getValue('version', ''); $entry = compact( 'reqId', - 'remoteAddr', - 'app', - 'message', 'level', 'time', + 'remoteAddr', + 'user', + 'app', 'method', 'url', - 'user', + 'message', 'userAgent', - 'version' + 'version', ); $entry = json_encode($entry); $handle = @fopen(self::$logFile, 'a'); |