mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4326 from nextcloud/downstream-27562 

Reorder the entries of the log for easier reading
This commit is contained in:
Morris Jobke 2017-04-13 13:11:47 -05:00 committed by GitHub
parent 81d3732bf5 695696a4a6
commit d0c0f6cfc1
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/AppFramework/Http/Request.php
View File

@ -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;

8
lib/private/Log/File.php
View File

@ -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'
);