actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-22 21:55:10 +02:00
Code Issues Releases Wiki Activity

refactor IntoHttpHandler trait

Browse Source
This commit is contained in:
Nikolay Kim
2017-12-29 11:33:04 -08:00
parent 1d195a2cf2
commit 3d3e4dae9a
5 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server.rs
View File

@@ -268,11 +268,9 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
let ka = self.keep_alive;
let factory = Arc::clone(&self.factory);
let addr = Arbiter::start(move |ctx: &mut Context<_>| {
let mut apps: Vec<_> = (*factory)()
.into_iter().map(|h| h.into_handler()).collect();
for app in &mut apps {
app.server_settings(s.clone());
}
let apps: Vec<_> = (*factory)()
.into_iter()
.map(|h| h.into_handler(s.clone())).collect();
ctx.add_stream(rx);
Worker::new(apps, h, ka)
});
@@ -482,10 +480,9 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
// set server settings
let addr: net::SocketAddr = "127.0.0.1:8080".parse().unwrap();
let settings = ServerSettings::new(Some(addr), &self.host, secure);
let mut apps: Vec<_> = (*self.factory)().into_iter().map(|h| h.into_handler()).collect();
for app in &mut apps {
app.server_settings(settings.clone());
}
let apps: Vec<_> = (*self.factory)()
.into_iter()
.map(|h| h.into_handler(settings.clone())).collect();
self.h = Some(Rc::new(WorkerSettings::new(apps, self.keep_alive)));
// start server