From c3f701bc6a2361c11a8024b718a9ba39eaa3ce4e Mon Sep 17 00:00:00 2001 From: yggverse Date: Fri, 4 Jul 2025 16:43:21 +0300 Subject: [PATCH] rename string member to `message` --- src/response.rs | 4 ++-- src/server/connection.rs | 18 +++++++++++++----- src/session/public.rs | 10 +++++----- 3 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/response.rs b/src/response.rs index d4a2c1f..912029d 100644 --- a/src/response.rs +++ b/src/response.rs @@ -8,12 +8,12 @@ pub enum Response<'a> { query: &'a str, }, InternalServerError { - error: String, + message: String, path: Option, query: Option<&'a str>, }, NotFound { - error: String, + message: String, path: PathBuf, query: &'a str, }, diff --git a/src/server/connection.rs b/src/server/connection.rs index ba38ae5..141aab0 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -73,7 +73,7 @@ impl Connection { } } Err(e) => match self.response(Response::InternalServerError { - error: format!( + message: format!( "[{}] < [{}] failed to handle incoming request: `{e}`", self.address.server, self.address.client ), @@ -135,9 +135,13 @@ impl Connection { ) } } - Response::InternalServerError { error, path, query } => { + Response::InternalServerError { + message, + path, + query, + } => { eprintln!( - "[{}] > [{}] `{query:?}` (`{:?}`): internal server error: `{error}`", + "[{}] > [{}] `{query:?}` (`{:?}`): internal server error: `{message}`", self.address.server, self.address.client, path.map(|p| p.to_string_lossy().to_string()), @@ -158,9 +162,13 @@ impl Connection { ); self.session.template.access_denied() } - Response::NotFound { error, path, query } => { + Response::NotFound { + message, + path, + query, + } => { eprintln!( - "[{}] < [{}] not found: `{query}` (`{}`) reason: {error}", + "[{}] < [{}] not found: `{query}` (`{}`) reason: {message}", self.address.server, self.address.client, path.to_string_lossy() diff --git a/src/session/public.rs b/src/session/public.rs index 3690e1c..32d37bb 100644 --- a/src/session/public.rs +++ b/src/session/public.rs @@ -60,7 +60,7 @@ impl Public { } Err(e) => { return callback(Response::NotFound { - error: e.to_string(), + message: e.to_string(), path, query, }); @@ -76,7 +76,7 @@ impl Public { is_root: path == self.public_dir, }, Err(e) => Response::InternalServerError { - error: e.to_string(), + message: e.to_string(), path: Some(path), query: Some(query), }, @@ -93,7 +93,7 @@ impl Public { } Err(e) => { return callback(Response::InternalServerError { - error: format!("failed to read response chunk: `{e}`"), + message: format!("failed to read response chunk: `{e}`"), path: Some(path), query: Some(query), }); @@ -101,7 +101,7 @@ impl Public { } }, Err(e) => callback(Response::InternalServerError { - error: format!("failed to read response: `{e}`"), + message: format!("failed to read response: `{e}`"), path: Some(path), query: Some(query), }), @@ -109,7 +109,7 @@ impl Public { _ => panic!(), // unexpected }, Err(e) => callback(Response::InternalServerError { - error: format!("failed to read storage: `{e}`"), + message: format!("failed to read storage: `{e}`"), path: Some(path), query: Some(query), }),