Skip to content

Commit f0dfbe6

Browse files
committed
rails3: fix RequestContextGenerator middleware order
Make sure it comes before ActionDispatch's logging of the request start fixes CNVS-13890 test plan: turn on 'log_context: true' in config/logging.yml, and make sure that the `Started GET "/path"` lines have the correct request id of the subsequent request, not the previous request. Change-Id: Ie6a77993955296b9032e07f8536506b6816517b7 Reviewed-on: https://gerrit.instructure.com/37183 Reviewed-by: Cody Cutrer <cody@instructure.com> Tested-by: Jenkins <jenkins@instructure.com> QA-Review: Jeremy Putnam <jeremyp@instructure.com> Product-Review: Brian Palmer <brianp@instructure.com>
1 parent 871d979 commit f0dfbe6

2 files changed

Lines changed: 1 addition & 1 deletion

File tree

File renamed without changes.

config/shared_boot.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
end
7777

7878
params_parser = CANVAS_RAILS2 ? 'ActionController::ParamsParser' : 'ActionDispatch::ParamsParser'
79-
config.middleware.insert_before(params_parser, "RequestContextGenerator")
79+
config.middleware.insert_before(CANVAS_RAILS2 ? params_parser : 'ActionDispatch::RequestId', "RequestContextGenerator")
8080
config.middleware.insert_before(params_parser, 'StatsTiming')
8181
config.middleware.insert_before(params_parser, 'Canvas::RequestThrottle')
8282
config.middleware.insert_before(params_parser, 'PreventNonMultipartParse')

0 commit comments

Comments
 (0)