Return an Error instead of panic if sync Client cannot startup runtime.

The timeout is also increased to 10 seconds from 5.

Closes #392
This commit is contained in:
Sean McArthur
2018-12-26 16:59:51 -08:00
parent c4985674aa
commit 4df232efad
2 changed files with 19 additions and 13 deletions

View File

@@ -147,7 +147,8 @@ impl Error {
Kind::TooManyRedirects |
Kind::RedirectLoop |
Kind::ClientError(_) |
Kind::ServerError(_) => None,
Kind::ServerError(_) |
Kind::RuntimeStartupFailure => None,
}
}
@@ -250,6 +251,7 @@ impl fmt::Display for Error {
f.write_str("Server Error: ")?;
fmt::Display::fmt(code, f)
}
Kind::RuntimeStartupFailure => f.write_str("Client runtime failed to start"),
}
}
}
@@ -275,6 +277,7 @@ impl StdError for Error {
Kind::RedirectLoop => "Infinite redirect loop",
Kind::ClientError(_) => "Client Error",
Kind::ServerError(_) => "Server Error",
Kind::RuntimeStartupFailure => "Client runtime failed to start",
}
}
@@ -298,7 +301,8 @@ impl StdError for Error {
Kind::TooManyRedirects |
Kind::RedirectLoop |
Kind::ClientError(_) |
Kind::ServerError(_) => None,
Kind::ServerError(_) |
Kind::RuntimeStartupFailure => None,
}
}
}
@@ -323,6 +327,7 @@ pub(crate) enum Kind {
RedirectLoop,
ClientError(StatusCode),
ServerError(StatusCode),
RuntimeStartupFailure,
}
@@ -489,6 +494,10 @@ pub(crate) fn url_bad_scheme(url: Url) -> Error {
Error::new(Kind::UrlBadScheme, Some(url))
}
pub(crate) fn runtime_startup() -> Error {
Error::new(Kind::RuntimeStartupFailure, None)
}
#[cfg(test)]
mod tests {
use super::*;