Skip to content

Make program exit gracefully when binding fails. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make program exit gracefully when binding fails. #22

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ fn run() -> Result<()> {
info!("root dir: {}", config.root_dir.display());
info!("extensions: {}", config.use_extensions);

let server = Server::bind(&config.addr)
let server = Server::try_bind(&config.addr)
.map_err(|e| translate_bind_error(e, config.addr))?
.serve(move || {
let config = config.clone();
service_fn(move |req| {
Expand Down Expand Up @@ -114,6 +115,19 @@ pub struct Config {
use_extensions: bool,
}

/// Translate a hyper error into our error for binding
fn translate_bind_error(e: hyper::Error, addr: SocketAddr) -> Error {
if let Some(os_error) = e
.source()
.and_then(|source| source.downcast_ref::<io::Error>())
{
if os_error.kind() == io::ErrorKind::AddrInUse {
return Error::AddrInUse(addr);
}
}
Error::BindWithHyper(e)
}

/// The function that returns a future of an HTTP response for each hyper
/// Request that is received. Errors are turned into an Error response (404 or
/// 500), and never propagated upward for hyper to deal with.
Expand Down Expand Up @@ -413,6 +427,12 @@ pub enum Error {
#[display(fmt = "failed to parse IP address")]
AddrParse(std::net::AddrParseError),

#[display(fmt = "the address \"{}\" is already in use", _0)]
AddrInUse(SocketAddr),

#[display(fmt = "failed to bind server to socket")]
BindWithHyper(hyper::Error),

#[display(fmt = "markdown is not UTF-8")]
MarkdownUtf8,

Expand All @@ -437,6 +457,8 @@ impl StdError for Error {
Http(e) => Some(e),
Io(e) => Some(e),
AddrParse(e) => Some(e),
AddrInUse(_) => None,
BindWithHyper(e) => Some(e),
MarkdownUtf8 => None,
StripPrefixInDirList(e) => Some(e),
TemplateRender(e) => Some(e),
Expand Down