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

aquatic_ws: add more anyhow error context annotations

Browse source
This commit is contained in:
Joakim Frostegård 2020-05-23 17:15:11 +02:00
parent 65684472a6
commit b9ee290ca0
4 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
TODO.md
View file

@ -1,7 +1,6 @@
# TODO # TODO
## aquatic_ws ## aquatic_ws
* add more anyhow context annotations for errors
* add sensible logging method, maybe stderrlog with quiet as default * add sensible logging method, maybe stderrlog with quiet as default
## aquatic_udp ## aquatic_udp

11
aquatic_ws/src/lib/lib.rs
View file

@ -119,16 +119,19 @@ pub fn create_tls_acceptor(
) -> anyhow::Result<Option<TlsAcceptor>> { ) -> anyhow::Result<Option<TlsAcceptor>> {
if config.network.use_tls { if config.network.use_tls {
let mut identity_bytes = Vec::new(); let mut identity_bytes = Vec::new();
let mut file = File::open(&config.network.tls_pkcs12_path)?; let mut file = File::open(&config.network.tls_pkcs12_path)
.context("Couldn't open pkcs12 identity file")?;
file.read_to_end(&mut identity_bytes)?; file.read_to_end(&mut identity_bytes)
.context("Couldn't read pkcs12 identity file")?;
let identity = Identity::from_pkcs12( let identity = Identity::from_pkcs12(
&mut identity_bytes, &mut identity_bytes,
&config.network.tls_pkcs12_password &config.network.tls_pkcs12_password
)?; ).context("Couldn't parse pkcs12 identity file")?;
let acceptor = TlsAcceptor::new(identity)?; let acceptor = TlsAcceptor::new(identity)
.context("Couldn't create TlsAcceptor from pkcs12 identity")?;
Ok(Some(acceptor)) Ok(Some(acceptor))
} else { } else {

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

@ -42,7 +42,7 @@ pub fn run_socket_worker(
}, },
Err(err) => { Err(err) => {
socket_worker_statuses.lock()[socket_worker_index] = Some( socket_worker_statuses.lock()[socket_worker_index] = Some(
Err(format!("Couldn't create TCP listener: {}", err)) Err(format!("Couldn't open socket: {:#}", err))
); );
} }
} }

17
aquatic_ws/src/lib/network/utils.rs
View file

@ -16,19 +16,24 @@ pub fn create_listener(
TcpBuilder::new_v4() TcpBuilder::new_v4()
} else { } else {
TcpBuilder::new_v6() TcpBuilder::new_v6()
}?; }.context("Couldn't create TcpBuilder")?;
if config.network.ipv6_only { if config.network.ipv6_only {
builder = builder.only_v6(true) builder = builder.only_v6(true)
.context("Failed setting ipv6_only to true")? .context("Couldn't put socket in ipv6 only mode")?
} }
builder = builder.reuse_port(true)?; builder = builder.reuse_port(true)
builder = builder.bind(&config.network.address)?; .context("Couldn't put socket in reuse_port mode")?;
builder = builder.bind(&config.network.address).with_context(||
format!("Couldn't bind socket to address {}", config.network.address)
)?;
let listener = builder.listen(128)?; let listener = builder.listen(128)
.context("Couldn't listen for connections on socket")?;
listener.set_nonblocking(true)?; listener.set_nonblocking(true)
.context("Couldn't put tcp listener in non-blocking mode")?;
Ok(listener) Ok(listener)
} }