Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs. Testplan: - [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`. - [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string - [ ] The generated Id is stable over the lifespan of one request Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI. Fixes https://github.com/owncloud/core/issues/13366
Showing
- lib/private/appframework/http/request.php 40 additions, 12 deletionslib/private/appframework/http/request.php
- lib/private/log/owncloud.php 1 addition, 1 deletionlib/private/log/owncloud.php
- lib/private/request.php 0 additions, 12 deletionslib/private/request.php
- lib/private/server.php 4 additions, 3 deletionslib/private/server.php
- lib/private/template.php 1 addition, 1 deletionlib/private/template.php
- lib/public/irequest.php 7 additions, 0 deletionslib/public/irequest.php
- tests/lib/appframework/controller/ApiControllerTest.php 4 additions, 3 deletionstests/lib/appframework/controller/ApiControllerTest.php
- tests/lib/appframework/controller/ControllerTest.php 9 additions, 8 deletionstests/lib/appframework/controller/ControllerTest.php
- tests/lib/appframework/dependencyinjection/DIContainerTest.php 4 additions, 1 deletion.../lib/appframework/dependencyinjection/DIContainerTest.php
- tests/lib/appframework/http/DispatcherTest.php 75 additions, 57 deletionstests/lib/appframework/http/DispatcherTest.php
- tests/lib/appframework/http/RequestTest.php 54 additions, 14 deletionstests/lib/appframework/http/RequestTest.php
- tests/lib/appframework/middleware/MiddlewareDispatcherTest.php 10 additions, 2 deletions.../lib/appframework/middleware/MiddlewareDispatcherTest.php
- tests/lib/appframework/middleware/MiddlewareTest.php 8 additions, 2 deletionstests/lib/appframework/middleware/MiddlewareTest.php
- tests/lib/appframework/middleware/security/CORSMiddlewareTest.php 19 additions, 4 deletions...b/appframework/middleware/security/CORSMiddlewareTest.php
- tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php 8 additions, 4 deletions...pframework/middleware/security/SecurityMiddlewareTest.php
- tests/lib/appframework/middleware/sessionmiddlewaretest.php 4 additions, 1 deletiontests/lib/appframework/middleware/sessionmiddlewaretest.php
Loading
Please register or sign in to comment