From 770fa761b8bf8452ff17a2036ca8413e74935a3d Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Mon, 9 Feb 2015 11:41:48 +0100 Subject: 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 --- lib/private/template.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/private/template.php') diff --git a/lib/private/template.php b/lib/private/template.php index d407eb8384c..4fa1c867d54 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -223,7 +223,7 @@ class OC_Template extends \OC\Template\Base { $content->assign('trace', $exception->getTraceAsString()); $content->assign('debugMode', defined('DEBUG') && DEBUG === true); $content->assign('remoteAddr', OC_Request::getRemoteAddress()); - $content->assign('requestID', OC_Request::getRequestID()); + $content->assign('requestID', \OC::$server->getRequest()->getId()); $content->printPage(); die(); } -- cgit v1.2.3