mirrors/doh-server
1
0
Fork 0
mirror of https://github.com/DNSCrypt/doh-server.git synced 2025-04-04 13:37:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't use tokio_current_thread; update tokio-timer (which doesn't work)

Browse source
This commit is contained in:
Frank Denis 2018-10-01 11:57:46 +02:00
parent 2723bd3ac6
commit 98a0c59047
2 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -16,4 +16,4 @@ futures = "0.1"
hyper = "0.12" hyper = "0.12"
tokio = "0.1" tokio = "0.1"
tokio-current-thread = "0.1" tokio-current-thread = "0.1"
tokio-timer = "0.1" tokio-timer = "0.2"

14
src/main.rs
View file

@ -19,7 +19,7 @@ use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::time::Duration; use std::time::Duration;
use tokio::net::{TcpListener, UdpSocket}; use tokio::net::{TcpListener, UdpSocket};
use tokio_timer::Timer; use tokio::prelude::FutureExt;
const DNS_QUERY_PARAM: &str = "dns"; const DNS_QUERY_PARAM: &str = "dns";
const LISTEN_ADDRESS: &str = "127.0.0.1:3000"; const LISTEN_ADDRESS: &str = "127.0.0.1:3000";
@ -61,7 +61,6 @@ struct InnerDoH {
path: String, path: String,
max_clients: usize, max_clients: usize,
timeout: Duration, timeout: Duration,
timers: Timer,
clients_count: ClientsCount, clients_count: ClientsCount,
} }
@ -125,9 +124,9 @@ impl Service for DoH {
clients_count_inner_err.decrement(); clients_count_inner_err.decrement();
err err
}); });
let timed = inner let timed = fut
.timers .map_err(|_| {})
.timeout(fut.map_err(|_| {}), inner.timeout) .timeout(inner.timeout)
.map_err(move |_| { .map_err(move |_| {
clients_count_inner_timeout.decrement(); clients_count_inner_timeout.decrement();
Error::Timeout Error::Timeout
@ -263,7 +262,6 @@ fn main() {
max_clients: MAX_CLIENTS, max_clients: MAX_CLIENTS,
timeout: Duration::from_secs(TIMEOUT_SEC), timeout: Duration::from_secs(TIMEOUT_SEC),
clients_count: ClientsCount::default(), clients_count: ClientsCount::default(),
timers: tokio_timer::wheel().build(),
}; };
parse_opts(&mut inner_doh); parse_opts(&mut inner_doh);
let path = inner_doh.path.clone(); let path = inner_doh.path.clone();
@ -278,10 +276,10 @@ fn main() {
let server = listener.incoming().for_each(move |io| { let server = listener.incoming().for_each(move |io| {
let service = doh.clone(); let service = doh.clone();
let conn = http.serve_connection(io, service).map_err(|_| {}); let conn = http.serve_connection(io, service).map_err(|_| {});
tokio_current_thread::spawn(conn); tokio::spawn(conn);
Ok(()) Ok(())
}); });
tokio_current_thread::block_on_all(server).unwrap(); tokio::run(server.map_err(|_| {}));
} }
fn parse_opts(inner_doh: &mut InnerDoH) { fn parse_opts(inner_doh: &mut InnerDoH) {