dusk/musikquadrupled
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it harder to run in http, provide more warnings, better handle errors

Browse Source
This commit is contained in:
dusk 2023-04-21 19:59:14 +03:00
parent 73e9bc20f4
commit 93e3617472
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.rs
View File

@ -1,11 +1,11 @@
use std::{net::SocketAddr, sync::Arc}; use std::{net::SocketAddr, process::ExitCode, sync::Arc};
use axum_server::tls_rustls::RustlsConfig; use axum_server::tls_rustls::RustlsConfig;
use dotenvy::Error as DotenvError; use dotenvy::Error as DotenvError;
use error::AppError; use error::AppError;
use hyper::{client::HttpConnector, Body}; use hyper::{client::HttpConnector, Body};
use token::Tokens; use token::Tokens;
use tracing::{error, info, warn}; use tracing::{info, warn};
use tracing_subscriber::prelude::*; use tracing_subscriber::prelude::*;
mod error; mod error;
@ -13,8 +13,13 @@ mod handler;
mod token; mod token;
#[tokio::main] #[tokio::main]
async fn main() { async fn main() -> ExitCode {
app().await.unwrap(); if let Err(err) = app().await {
tracing::error!("aborting: {err}");
ExitCode::FAILURE
} else {
ExitCode::SUCCESS
}
} }
async fn app() -> Result<(), AppError> { async fn app() -> Result<(), AppError> {
@ -48,14 +53,16 @@ async fn app() -> Result<(), AppError> {
let (task, scheme) = if let (Some(cert_path), Some(key_path)) = (cert_path, key_path) { let (task, scheme) = if let (Some(cert_path), Some(key_path)) = (cert_path, key_path) {
info!("cert path is: {cert_path}"); info!("cert path is: {cert_path}");
info!("key path is: {key_path}"); info!("key path is: {key_path}");
let config = RustlsConfig::from_pem_file(cert_path, key_path) let config = RustlsConfig::from_pem_file(cert_path, key_path).await?;
.await
.unwrap();
let task = tokio::spawn(axum_server::bind_rustls(addr, config).serve(make_service)); let task = tokio::spawn(axum_server::bind_rustls(addr, config).serve(make_service));
(task, "https") (task, "https")
} else { } else if get_conf("INSECURE").ok().is_some() {
tracing::warn!("RUNNING IN INSECURE MODE (NO TLS)");
let task = tokio::spawn(axum_server::bind(addr).serve(make_service)); let task = tokio::spawn(axum_server::bind(addr).serve(make_service));
(task, "http") (task, "http")
} else {
tracing::warn!("note: either one or both of MUSIKQUAD_TLS_CERT_PATH and MUSIKQUAD_TLS_KEY_PATH has not been set");
return Err("will not serve HTTP unless the MUSIKQUAD_INSECURE env var is set".into());
}; };
info!("listening on {scheme}://{addr}"); info!("listening on {scheme}://{addr}");
@ -68,21 +75,7 @@ fn get_conf(key: &str) -> Result<String, AppError> {
const ENV_NAMESPACE: &str = "MUSIKQUAD"; const ENV_NAMESPACE: &str = "MUSIKQUAD";
let key = format!("{ENV_NAMESPACE}_{key}"); let key = format!("{ENV_NAMESPACE}_{key}");
match std::env::var(&key) { std::env::var(&key).map_err(Into::into)
Ok(val) => return Ok(val),
Err(err) => {
use std::env::VarError;
match err {
VarError::NotPresent => {
error!("Config option {key} was not set but is required");
}
VarError::NotUnicode(_) => {
error!("Config option {key} was not unicode");
}
}
return Err(err.into());
}
}
} }
type Client = hyper::Client<HttpConnector, Body>; type Client = hyper::Client<HttpConnector, Body>;