From cfcaf3f7c7ec6db48782932fd6ec025d12b79a40 Mon Sep 17 00:00:00 2001
From: int 80h <int@80h.dev>
Date: Fri, 29 May 2020 23:34:49 -0400
Subject: [PATCH] Error handling

---
 src/main.rs | 11 +++++++----
 src/tls.rs  |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 1f0abb9..ad549bf 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -361,10 +361,13 @@ fn main() -> io::Result<()> {
             let default = default.clone();
 
             let fut = async move {
-                let stream = tokio_openssl::accept(&acceptor, stream)
-                    .await
-                    .expect("Couldn't accept");
-
+                let stream = match tokio_openssl::accept(&acceptor, stream).await {
+                    Ok(s) => s,
+                    Err(e) => {
+                        log::error!("Error: {}",e);
+                        return Ok(());
+                    },
+                };
                 let srv = match stream.ssl().servername(NameType::HOST_NAME) {
                     Some(s) => match cmap.get(s) {
                         Some(ss) => ss,
diff --git a/src/tls.rs b/src/tls.rs
index b41f584..7d352fc 100644
--- a/src/tls.rs
+++ b/src/tls.rs
@@ -21,14 +21,14 @@ pub fn acceptor_conf(cfg: config::Config) -> Result<SslAcceptor, ErrorStack> {
         match ctx.set_private_key_file(&server.key, SslFiletype::PEM) {
             Ok(c) => c,
             Err(e) => {
-                eprintln!("Error: Can't load key file");
+                log::error!("Error: Can't load key file");
                 return Err(e);
             }
         };
         match ctx.set_certificate_chain_file(&server.cert) {
             Ok(c) => c,
             Err(e) => {
-                eprintln!("Error: Can't load cert file");
+                log::error!("Error: Can't load cert file");
                 return Err(e);
             }
         };