noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only log successful startup after server binds to desired port

Browse source
This commit is contained in:
Tobie Morgan Hitchcock 2022-08-16 22:09:16 +01:00
parent 2945b7d724
commit b8c793f7a4
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/net/mod.rs
View file

@ -62,12 +62,20 @@ pub async fn init() -> Result<(), Error> {
info!(target: LOG, "Starting web server on {}", &opt.bind); info!(target: LOG, "Starting web server on {}", &opt.bind);
info!(target: LOG, "Started web server on {}", &opt.bind); if let (Some(c), Some(k)) = (&opt.crt, &opt.key) {
// Bind the server to the desired port
if let (Some(crt), Some(key)) = (&opt.crt, &opt.key) { let (adr, srv) = warp::serve(net).tls().cert_path(c).key_path(k).bind_ephemeral(opt.bind);
warp::serve(net).tls().cert_path(crt).key_path(key).run(opt.bind).await // Log the server startup status
info!(target: LOG, "Started web server on {}", &adr);
// Run the server forever
srv.await
} else { } else {
warp::serve(net).run(opt.bind).await // Bind the server to the desired port
let (adr, srv) = warp::serve(net).bind_ephemeral(opt.bind);
// Log the server startup status
info!(target: LOG, "Started web server on {}", &adr);
// Run the server forever
srv.await
}; };
Ok(()) Ok(())