Skip to content
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

Refactor server error handling #607

Merged
merged 3 commits into from
Oct 4, 2022
Merged

Refactor server error handling #607

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c8ce65
Refactor server error handling
casey Oct 4, 2022
f612488
Merge branch 'master' into deduplicate-server-error-handling
casey Oct 4, 2022
fb5c272
Merge branch 'master' into deduplicate-server-error-handling
casey Oct 4, 2022
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
84 changes: 14 additions & 70 deletions src/subcommand/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@ use {
mod deserialize_ordinal_from_str;
mod templates;

fn html_status(status_code: StatusCode) -> (StatusCode, Html<&'static str>) {
(
status_code,
Html(status_code.canonical_reason().unwrap_or_default()),
)
}

#[derive(Deserialize)]
struct Search {
query: String,
Expand Down Expand Up @@ -245,16 +252,7 @@ impl Server {
Ok(height) => ClockSvg::new(height).into_response(),
Err(err) => {
eprintln!("Failed to retrieve height from index: {err}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand All @@ -267,16 +265,7 @@ impl Server {
Ok(blocktime) => OrdinalHtml { ordinal, blocktime }.page().into_response(),
Err(err) => {
eprintln!("Failed to retrieve blocktime from index: {err}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand All @@ -290,16 +279,7 @@ impl Server {
Ok(None) => (StatusCode::NOT_FOUND, Html("Output unknown.".to_string())).into_response(),
Err(err) => {
eprintln!("Error serving request for output: {err}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand All @@ -325,16 +305,7 @@ impl Server {
Ok(blocks) => HomeHtml::new(blocks).page().into_response(),
Err(err) => {
eprintln!("Error getting blocks: {err}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand All @@ -357,16 +328,7 @@ impl Server {
.into_response(),
Err(error) => {
eprintln!("Error serving request for block with hash {hash}: {error}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand All @@ -380,28 +342,10 @@ impl Server {
Ok(Some(transaction)) => TransactionHtml::new(transaction, network.0)
.page()
.into_response(),
Ok(None) => (
StatusCode::NOT_FOUND,
Html(
StatusCode::NOT_FOUND
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response(),
Ok(None) => html_status(StatusCode::NOT_FOUND).into_response(),
Err(error) => {
eprintln!("Error serving request for transaction with txid {txid}: {error}");
(
StatusCode::INTERNAL_SERVER_ERROR,
Html(
StatusCode::INTERNAL_SERVER_ERROR
.canonical_reason()
.unwrap_or_default()
.to_string(),
),
)
.into_response()
html_status(StatusCode::INTERNAL_SERVER_ERROR).into_response()
}
}
}
Expand Down