YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli_helpers: use anyhow in app fn; aquatic_ws: reorganize error handling

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-23 14:05:50 +02:00
parent 1efe6f96c5
commit 526faa9aab
13 changed files with 134 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

35
aquatic_ws/src/lib/network/mod.rs
View file

@ -23,12 +23,39 @@ pub fn run_socket_worker(
socket_worker_index: usize,
in_message_sender: InMessageSender,
out_message_receiver: OutMessageReceiver,
opt_tls_acceptor: Option<TlsAcceptor>,
){
match create_listener(&config){
Ok(listener) => {
run_poll_loop(
config,
socket_worker_index,
in_message_sender,
out_message_receiver,
listener,
opt_tls_acceptor
);
},
Err(err) => {
eprintln!("Couldn't create TCP listener: {}", err)
}
}
}
pub fn run_poll_loop(
config: Config,
socket_worker_index: usize,
in_message_sender: InMessageSender,
out_message_receiver: OutMessageReceiver,
listener: ::std::net::TcpListener,
opt_tls_acceptor: Option<TlsAcceptor>,
){
let poll_timeout = Duration::from_millis(
config.network.poll_timeout_milliseconds
);
let mut listener = TcpListener::from_std(create_listener(&config));
let mut listener = TcpListener::from_std(listener);
let mut poll = Poll::new().expect("create poll");
let mut events = Events::with_capacity(config.network.poll_event_capacity);
@ -36,12 +63,6 @@ pub fn run_socket_worker(
.register(&mut listener, Token(0), Interest::READABLE)
.unwrap();
let opt_tls_acceptor = if config.network.use_tls {
Some(create_tls_acceptor(&config))
} else {
None
};
let mut connections: ConnectionMap = HashMap::new();
let mut poll_token_counter = Token(0usize);