aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFuwn <[email protected]>2022-03-27 04:03:16 +0000
committerFuwn <[email protected]>2022-03-27 04:03:16 +0000
commit0cba9d842de5cd43869a85ea4dc03ca0423806a7 (patch)
tree67467065582811ec2a464d02cccdb08f3ee366f4 /src
parentrefactor(run): generic errors (diff)
downloadwindmark-0cba9d842de5cd43869a85ea4dc03ca0423806a7.tar.xz
windmark-0cba9d842de5cd43869a85ea4dc03ca0423806a7.zip
refactor(router): more generic errors
Diffstat (limited to 'src')
-rw-r--r--src/lib.rs26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib.rs b/src/lib.rs
index f2a93c0..0814667 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,7 +36,7 @@ pub mod utilities;
#[macro_use]
extern crate log;
-use std::sync::Arc;
+use std::{error::Error, sync::Arc};
use matchit::Params;
use openssl::ssl::{self, SslAcceptor, SslMethod};
@@ -209,8 +209,8 @@ impl Router {
/// # Errors
///
/// if the `TcpListener` could not be bound.
- pub async fn run(&mut self) -> std::io::Result<()> {
- self.create_acceptor();
+ pub async fn run(&mut self) -> Result<(), Box<dyn Error>> {
+ self.create_acceptor()?;
#[cfg(feature = "logger")]
if self.default_logger {
@@ -353,19 +353,19 @@ impl Router {
Ok(())
}
- fn create_acceptor(&mut self) {
- let mut builder =
- SslAcceptor::mozilla_intermediate(ssl::SslMethod::tls()).unwrap();
+ fn create_acceptor(&mut self) -> Result<(), Box<dyn Error>> {
+ let mut builder = SslAcceptor::mozilla_intermediate(ssl::SslMethod::tls())?;
- builder
- .set_private_key_file(&self.private_key_file_name, ssl::SslFiletype::PEM)
- .unwrap();
- builder
- .set_certificate_chain_file(&self.certificate_chain_file_name)
- .unwrap();
- builder.check_private_key().unwrap();
+ builder.set_private_key_file(
+ &self.private_key_file_name,
+ ssl::SslFiletype::PEM,
+ )?;
+ builder.set_certificate_chain_file(&self.certificate_chain_file_name)?;
+ builder.check_private_key()?;
self.ssl_acceptor = Arc::new(builder.build());
+
+ Ok(())
}
/// Use a self-made `SslAcceptor`