feat: graceful shutdown for HTTPS server

Author: LeoBorai

src/config/util/tls.rs

@@ -1,12 +1,9 @@
-use anyhow::{ensure, Context, Error, Result};
-use rustls::internal::msgs::codec::Codec;
-use rustls::Reader;
+use anyhow::{Context, Error, Result};
 use rustls::{Certificate, PrivateKey};
-use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys, Item};
+use rustls_pemfile::{pkcs8_private_keys, rsa_private_keys};
 use serde::Deserialize;
 use std::fs::File;
-use std::io::{BufRead, BufReader, Read};
-use std::iter;
+use std::io::BufReader;
 use std::path::Path;
 use std::str::FromStr;
 
@@ -40,7 +37,6 @@ pub fn load_cert(path: &Path) -> Result<Vec<Certificate>> {
     let mut buf_reader = BufReader::new(file);
     let cert_bytes = &rustls_pemfile::certs(&mut buf_reader).unwrap()[0];
 
-    ensure!(cert_bytes.len() > 0, "Empty certificate");
     Ok(vec![Certificate(cert_bytes.to_vec())])
 }
 
@@ -61,6 +57,5 @@ pub fn load_private_key(path: &Path, kind: &PrivateKeyAlgorithm) -> Result<Priva
         })?,
     };
 
-    ensure!(keys.len() == 1, "Expected a single private key");
     Ok(PrivateKey(keys[0].clone()))
 }

src/server/mod.rs

@@ -105,7 +105,7 @@ impl Server {
             println!("Serving HTTPS: {}", address);
         }
 
-        if let Err(e) = server
+        let server_with_graceful_shutdown = server
             .serve(make_service_fn(|_| {
                 // Move a clone of `handler` into the `service_fn`.
                 let handler = handler.clone();
@@ -116,8 +116,9 @@ impl Server {
                     }))
                 }
             }))
-            .await
-        {
+            .with_graceful_shutdown(crate::utils::signal::shutdown_signal());
+
+        if let Err(e) = server_with_graceful_shutdown.await {
             eprint!("Server Error: {}", e);
         }
     }