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

Use tokio-current-thread

Browse source
This commit is contained in:
Frank Denis 2018-08-24 19:39:30 +02:00
parent 81518fe385
commit 82587db5f6
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -15,4 +15,5 @@ clap = "2"
futures = "0.1" futures = "0.1"
hyper = "0.12" hyper = "0.12"
tokio = "0.1" tokio = "0.1"
tokio-current-thread = "0.1"
tokio-timer = "0.1" tokio-timer = "0.1"

6
src/main.rs
View file

@ -3,6 +3,7 @@ extern crate clap;
extern crate futures; extern crate futures;
extern crate hyper; extern crate hyper;
extern crate tokio; extern crate tokio;
extern crate tokio_current_thread;
extern crate tokio_timer; extern crate tokio_timer;
mod dns; mod dns;
@ -17,7 +18,6 @@ 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; use std::time::Duration;
use tokio::executor::current_thread;
use tokio::net::{TcpListener, UdpSocket}; use tokio::net::{TcpListener, UdpSocket};
use tokio_timer::Timer; use tokio_timer::Timer;
@ -253,10 +253,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(|_| {});
current_thread::spawn(conn); tokio_current_thread::spawn(conn);
Ok(()) Ok(())
}); });
current_thread::block_on_all(server).unwrap(); tokio_current_thread::block_on_all(server).unwrap();
} }
fn parse_opts(inner_doh: &mut InnerDoH) { fn parse_opts(inner_doh: &mut InnerDoH) {