Skip to content

Commit ed24e5c

Browse files
committed
Fix router config not used in agent 2.3
1 parent cbad7ee commit ed24e5c

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

src/ffi.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,9 @@ pub unsafe extern "C" fn redirectionio_router_match_action(_router: *const Route
8787

8888
let router = &*_router;
8989
let request = &*_request;
90-
let request_configured = Request::rebuild_with_config(&router.config, request);
9190

92-
let routes = router.match_request(&request_configured);
93-
let action = Action::from_routes_rule(routes, &request_configured);
91+
let routes = router.match_request(request);
92+
let action = Action::from_routes_rule(routes, request);
9493

9594
Box::into_raw(Box::new(action))
9695
}
@@ -104,9 +103,7 @@ pub unsafe extern "C" fn redirectionio_router_trace(_router: *const Router<Rule>
104103
let router = &*_router;
105104
let request = &*_request;
106105

107-
let request_configured = Request::rebuild_with_config(&router.config, request);
108-
109-
let trace = RouterTrace::create_from_router(router, &request_configured);
106+
let trace = RouterTrace::create_from_router(router, request);
110107

111108
Box::into_raw(Box::new(trace))
112109
}

src/router/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ impl<T: RouteData> Router<T> {
5151
}
5252

5353
pub fn match_request(&self, request: &Request) -> Vec<&Route<T>> {
54-
self.matcher.match_request(request)
54+
let request_rebuild = Request::rebuild_with_config(&self.config, request);
55+
56+
self.matcher.match_request(&request_rebuild)
5557
}
5658

5759
pub fn len(&self) -> usize {
@@ -63,7 +65,9 @@ impl<T: RouteData> Router<T> {
6365
}
6466

6567
pub fn trace_request(&self, request: &Request) -> Vec<Trace<T>> {
66-
self.matcher.trace(request)
68+
let request_rebuild = Request::rebuild_with_config(&self.config, request);
69+
70+
self.matcher.trace(&request_rebuild)
6771
}
6872

6973
pub fn get_route(&self, request: &Request) -> Option<&Route<T>> {

0 commit comments

Comments
 (0)