mirror of
https://github.com/YGGverse/nexy.git
synced 2026-03-31 09:15:28 +00:00
rename log component to the access_log
This commit is contained in:
parent
d3dbde37ac
commit
17bb60d4a4
3 changed files with 12 additions and 8 deletions
|
|
@ -43,14 +43,18 @@ impl Connection {
|
||||||
.clone()
|
.clone()
|
||||||
.storage
|
.storage
|
||||||
.request(&q, |r| t += self.response(r)); // chunk loop
|
.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) => {
|
Err(e) => {
|
||||||
t += self.response(Response::InternalServerError(format!(
|
t += self.response(Response::InternalServerError(format!(
|
||||||
"[{}] < [{}] failed to handle incoming request: `{e}`",
|
"[{}] < [{}] failed to handle incoming request: `{e}`",
|
||||||
self.address.server, self.address.client
|
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()
|
self.shutdown()
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
|
mod access_log;
|
||||||
mod debug;
|
mod debug;
|
||||||
mod log;
|
|
||||||
mod storage;
|
mod storage;
|
||||||
mod template;
|
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
|
/// Shared, multi-thread features for the current server session
|
||||||
pub struct Session {
|
pub struct Session {
|
||||||
pub debug: Debug,
|
pub debug: Debug,
|
||||||
pub log: Log,
|
pub access_log: AccessLog,
|
||||||
pub storage: Storage,
|
pub storage: Storage,
|
||||||
pub template: Template,
|
pub template: Template,
|
||||||
}
|
}
|
||||||
|
|
@ -17,7 +17,7 @@ impl Session {
|
||||||
pub fn init(config: &crate::config::Config) -> anyhow::Result<Self> {
|
pub fn init(config: &crate::config::Config) -> anyhow::Result<Self> {
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
debug: Debug::init(config)?,
|
debug: Debug::init(config)?,
|
||||||
log: Log::init(config)?,
|
access_log: AccessLog::init(config)?,
|
||||||
storage: Storage::init(config)?,
|
storage: Storage::init(config)?,
|
||||||
template: Template::init(config)?,
|
template: Template::init(config)?,
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -5,9 +5,9 @@
|
||||||
use std::{fs::File, io::Write, net::SocketAddr, sync::RwLock};
|
use std::{fs::File, io::Write, net::SocketAddr, sync::RwLock};
|
||||||
|
|
||||||
/// Writes log as
|
/// Writes log as
|
||||||
pub struct Log(Option<RwLock<File>>);
|
pub struct AccessLog(Option<RwLock<File>>);
|
||||||
|
|
||||||
impl Log {
|
impl AccessLog {
|
||||||
pub fn init(config: &crate::config::Config) -> anyhow::Result<Self> {
|
pub fn init(config: &crate::config::Config) -> anyhow::Result<Self> {
|
||||||
Ok(Self(match config.access_log {
|
Ok(Self(match config.access_log {
|
||||||
Some(ref p) => Some(RwLock::new(File::create(p)?)),
|
Some(ref p) => Some(RwLock::new(File::create(p)?)),
|
||||||
Loading…
Add table
Add a link
Reference in a new issue