Skip to content

Commit 05ff8fd

Browse files
Improve code layout and fix status codes
1 parent 30e34c1 commit 05ff8fd

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

src/main.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ async fn main() {
4646
let root_url = valk_utils::get_var("ROOT_URL");
4747
let root_url = root_url.trim_end_matches('/').to_owned();
4848
let port: u16 = std::env::var("PORT").map_or(DEFAULT_PORT, |v| v.parse().unwrap());
49+
4950
let mut default_headers = HeaderMap::new();
5051
default_headers.insert("Accept", "application/json".parse().unwrap());
5152
let http_client = Client::builder()
@@ -59,6 +60,7 @@ async fn main() {
5960
.redirect(Policy::limited(100))
6061
.build()
6162
.unwrap();
63+
6264
let current_mcstatus: Arc<RwLock<ServicesResponse>> =
6365
Arc::new(RwLock::new(get_mcstatus(http_client.clone()).await));
6466
tokio::spawn(refresh_mcstatus(http_client, Arc::clone(&current_mcstatus)));
@@ -96,6 +98,7 @@ async fn main() {
9698
.layer(axum::middleware::from_fn(cache)),
9799
)
98100
.with_state(state);
101+
99102
let socket_address = SocketAddr::from(([0, 0, 0, 0], port));
100103
let tcp = TcpListener::bind(socket_address).await.unwrap();
101104
axum::serve(tcp, app)
@@ -355,7 +358,12 @@ impl<T: Serialize> IntoResponse for Json<T> {
355358
.as_bytes()
356359
.to_vec()
357360
});
358-
([(CONTENT_TYPE, JSON_CTYPE.clone())], body).into_response()
361+
(
362+
StatusCode::INTERNAL_SERVER_ERROR,
363+
[(CONTENT_TYPE, JSON_CTYPE.clone())],
364+
body,
365+
)
366+
.into_response()
359367
}
360368
}
361369

0 commit comments

Comments
 (0)