manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Mejora la gestión de la traza de seguimiento

Browse source 
Aprovecha la potencia de los crates propios del ecosistema tracing para
proporcionar las funcionalidades más importantes vía ajustes de
configuración.
This commit is contained in:
Manuel Cillero 2022-02-28 22:20:28 +01:00
parent 83fd12b5cc
commit 0f185887a6
8 changed files with 119 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

66
src/core/server/main.rs
View file

@ -1,59 +1,11 @@
use crate::{base, trace};
use crate::{Lazy, base, locale, trace};
use crate::config::SETTINGS;
use crate::core::{Server, all, server};
use crate::core::module::register_module;
use tracing_log::LogTracer;
use tracing_subscriber::{EnvFilter, Registry};
use tracing_subscriber::layer::SubscriberExt;
use tracing::subscriber::set_global_default;
use tracing_bunyan_formatter::{BunyanFormattingLayer, JsonStorageLayer};
use tracing_actix_web::TracingLogger;
use actix_web::middleware::normalize;
pub fn run(bootstrap: Option<fn()>) -> Result<Server, std::io::Error> {
// Inicia la traza de ejecución de la aplicación.
let env_filter = EnvFilter::try_new(&SETTINGS.log.tracing)
.unwrap_or(EnvFilter::new("Info"));
let rolling = SETTINGS.log.rolling.to_lowercase();
let (non_blocking, _guard) = match rolling.as_str() {
"stdout" => tracing_appender::non_blocking(
std::io::stdout()
),
_ => tracing_appender::non_blocking({
let path = &SETTINGS.log.path;
let prefix = &SETTINGS.log.prefix;
match rolling.as_str() {
"daily" => tracing_appender::rolling::daily(path, prefix),
"hourly" => tracing_appender::rolling::hourly(path, prefix),
"minutely" => tracing_appender::rolling::minutely(path, prefix),
"endless" => tracing_appender::rolling::never(path, prefix),
_ => {
println!(
"Rolling value \"{}\" not valid. Using \"daily\"",
rolling
);
tracing_appender::rolling::daily(path, prefix)
}
}
})
};
let formatting_layer = BunyanFormattingLayer::new(
String::from(&SETTINGS.app.name),
non_blocking
);
let subscriber = Registry::default()
.with(env_filter)
.with(JsonStorageLayer)
.with(formatting_layer);
set_global_default(subscriber).expect("Unable to setup subscriber!");
LogTracer::init().expect("Unable to setup log tracer!");
// Imprime el rótulo (opcional) de bienvenida.
if SETTINGS.app.startup_banner.to_lowercase() != "off" {
let figfont = figlet_rs::FIGfont::from_content(
@ -63,9 +15,11 @@ pub fn run(bootstrap: Option<fn()>) -> Result<Server, std::io::Error> {
"speed" => include_str!("figfonts/speed.flf"),
"starwars" => include_str!("figfonts/starwars.flf"),
_ => {
trace::warn!(
"FIGfont \"{}\" not found for banner. Using \"{}\"",
SETTINGS.app.startup_banner, "Small"
println!(
"FIGfont \"{}\" not found for banner. {}. {}.",
SETTINGS.app.startup_banner,
"Using \"Small\"",
"Check the settings file",
);
include_str!("figfonts/small.flf")
}
@ -78,6 +32,12 @@ pub fn run(bootstrap: Option<fn()>) -> Result<Server, std::io::Error> {
);
}
// Traza de seguimiento.
Lazy::force(&trace::TRACING);
// Identificador de idioma.
Lazy::force(&locale::LANGID);
// Ejecuta la función de inicio de la aplicación.
if bootstrap != None {
trace::debug!("Calling application bootstrap");
@ -92,7 +52,7 @@ pub fn run(bootstrap: Option<fn()>) -> Result<Server, std::io::Error> {
// Inicializa el servidor web.
let server = server::HttpServer::new(|| {
server::App::new()
.wrap(TracingLogger)
.wrap(tracing_actix_web::TracingLogger)
.wrap(normalize::NormalizePath::new(normalize::TrailingSlash::Trim))
.configure(&all::themes)
.configure(&all::modules)