diff --git a/src/server/connection.rs b/src/server/connection.rs index 91f4d62..6e953bf 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -43,14 +43,18 @@ impl Connection { .clone() .storage .request(&q, |r| t += self.response(r)); // chunk loop - self.session.log.clf(&self.address.client, Some(&q), 0, t); + self.session + .access_log + .clf(&self.address.client, Some(&q), 0, t); } Err(e) => { t += self.response(Response::InternalServerError(format!( "[{}] < [{}] failed to handle incoming request: `{e}`", self.address.server, self.address.client ))); - self.session.log.clf(&self.address.client, None, 1, t); + self.session + .access_log + .clf(&self.address.client, None, 1, t); } } self.shutdown() diff --git a/src/session.rs b/src/session.rs index edd0d89..b136c1c 100644 --- a/src/session.rs +++ b/src/session.rs @@ -1,14 +1,14 @@ +mod access_log; mod debug; -mod log; mod storage; mod template; -use {debug::Debug, log::Log, storage::Storage, template::Template}; +use {access_log::AccessLog, debug::Debug, storage::Storage, template::Template}; /// Shared, multi-thread features for the current server session pub struct Session { pub debug: Debug, - pub log: Log, + pub access_log: AccessLog, pub storage: Storage, pub template: Template, } @@ -17,7 +17,7 @@ impl Session { pub fn init(config: &crate::config::Config) -> anyhow::Result { Ok(Self { debug: Debug::init(config)?, - log: Log::init(config)?, + access_log: AccessLog::init(config)?, storage: Storage::init(config)?, template: Template::init(config)?, }) diff --git a/src/session/log.rs b/src/session/access_log.rs similarity index 95% rename from src/session/log.rs rename to src/session/access_log.rs index d8162ea..6025f5b 100644 --- a/src/session/log.rs +++ b/src/session/access_log.rs @@ -5,9 +5,9 @@ use std::{fs::File, io::Write, net::SocketAddr, sync::RwLock}; /// Writes log as -pub struct Log(Option>); +pub struct AccessLog(Option>); -impl Log { +impl AccessLog { pub fn init(config: &crate::config::Config) -> anyhow::Result { Ok(Self(match config.access_log { Some(ref p) => Some(RwLock::new(File::create(p)?)),