mirror of
https://github.com/shadowsocks/shadowsocks-rust.git
synced 2026-11-07 00:13:33 +00:00
use the latest coio
This commit is contained in:
+5
-2
@@ -40,6 +40,8 @@ use clap::{App, Arg};
|
||||
|
||||
use std::net::{SocketAddr, IpAddr};
|
||||
|
||||
use coio::Scheduler;
|
||||
|
||||
use shadowsocks::config::{Config, ServerConfig, self};
|
||||
use shadowsocks::config::DEFAULT_DNS_CACHE_CAPACITY;
|
||||
use shadowsocks::relay::{RelayLocal, Relay};
|
||||
@@ -174,6 +176,7 @@ fn main() {
|
||||
let threads = matches.value_of("THREADS").unwrap_or("1").parse::<usize>()
|
||||
.ok().expect("`threads` should be an integer");
|
||||
|
||||
RelayLocal::new(config).run(threads);
|
||||
panic!("Relay stopped.");
|
||||
Scheduler::with_workers(threads).run(move|| {
|
||||
RelayLocal::new(config).run();
|
||||
}).unwrap();
|
||||
}
|
||||
|
||||
+6
-2
@@ -36,9 +36,12 @@ extern crate shadowsocks;
|
||||
extern crate log;
|
||||
extern crate fern;
|
||||
extern crate time;
|
||||
extern crate coio;
|
||||
|
||||
use clap::{App, Arg};
|
||||
|
||||
use coio::Scheduler;
|
||||
|
||||
use shadowsocks::config::{Config, ServerConfig, self};
|
||||
use shadowsocks::config::DEFAULT_DNS_CACHE_CAPACITY;
|
||||
use shadowsocks::relay::{RelayServer, Relay};
|
||||
@@ -167,6 +170,7 @@ fn main() {
|
||||
let threads = matches.value_of("THREADS").unwrap_or("1").parse::<usize>()
|
||||
.ok().expect("`threads` should be an integer");
|
||||
|
||||
RelayServer::new(config).run(threads);
|
||||
panic!("Server should never ends");
|
||||
Scheduler::with_workers(threads).run(move|| {
|
||||
RelayServer::new(config).run();
|
||||
}).unwrap();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user