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

Back to tokio-timer 0.1

Browse source
This commit is contained in:
Frank Denis 2018-07-07 22:59:29 +02:00
parent 82630f4a31
commit d14dd35ab0
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -15,5 +15,5 @@ clap = "2"
futures = "0.1" futures = "0.1"
hyper = "0.12" hyper = "0.12"
tokio = "0.1" tokio = "0.1"
tokio-timer = "0.2" tokio-timer = "0.1"
clippy = {version = ">=0", optional = true} clippy = {version = ">=0", optional = true}

12
src/main.rs
View file

@ -19,10 +19,10 @@ use hyper::{Body, Method, Request, Response, StatusCode};
use std::net::SocketAddr; use std::net::SocketAddr;
use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::atomic::{AtomicUsize, Ordering};
use std::sync::Arc; use std::sync::Arc;
use std::time::{Duration, Instant}; use std::time::Duration;
use tokio::executor::current_thread; use tokio::executor::current_thread;
use tokio::net::{TcpListener, UdpSocket}; use tokio::net::{TcpListener, UdpSocket};
use tokio_timer::{timer, Timer}; use tokio_timer::Timer;
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";
@ -46,7 +46,7 @@ struct InnerDoH {
path: String, path: String,
max_clients: usize, max_clients: usize,
timeout: Duration, timeout: Duration,
timer_handle: timer::Handle, timers: Timer,
clients_count: Arc<AtomicUsize>, clients_count: Arc<AtomicUsize>,
} }
@ -101,8 +101,8 @@ impl Service for DoH {
err err
}); });
let timed = inner let timed = inner
.timer_handle .timers
.deadline(fut.map_err(|_| {}), Instant::now() + inner.timeout) .timeout(fut.map_err(|_| {}), inner.timeout)
.map_err(|_| Error::Timeout); .map_err(|_| Error::Timeout);
Box::new(timed) Box::new(timed)
} }
@ -235,7 +235,7 @@ fn main() {
max_clients: MAX_CLIENTS, max_clients: MAX_CLIENTS,
timeout: Duration::from_secs(TIMEOUT_SEC), timeout: Duration::from_secs(TIMEOUT_SEC),
clients_count: Arc::new(AtomicUsize::new(0)), clients_count: Arc::new(AtomicUsize::new(0)),
timer_handle: Timer::default().handle(), timers: tokio_timer::wheel().build(),
}; };
parse_opts(&mut inner_doh); parse_opts(&mut inner_doh);
let doh = DoH { let doh = DoH {