mykola/mk-dl-bot_legacy
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

instead of file logging we're going to use stdout because bot will be run in container, therefore container output is a log

Browse source
This commit is contained in:
mykola2312 2024-02-29 20:20:06 +02:00
parent 397178e856
commit 17ecd681d8
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/bot/log.rs
View file

@ -1,9 +1,9 @@
use std::io; use std::io;
use tracing::{level_filters::LevelFilter, Subscriber}; use tracing::{level_filters::LevelFilter, Subscriber};
use tracing_appender::rolling::{RollingFileAppender, Rotation}; //use tracing_appender::rolling::{RollingFileAppender, Rotation};
use tracing_subscriber::{fmt, layer::SubscriberExt, layer::Filter, prelude::*}; use tracing_subscriber::{fmt, layer::SubscriberExt, layer::Filter, prelude::*};
use super::util::VAR_LOG; //use super::util::VAR_LOG;
// A layer filter to prevent polling timeout errors from clogging logs // A layer filter to prevent polling timeout errors from clogging logs
struct TeloxideNoiseFilter {} struct TeloxideNoiseFilter {}
@ -22,26 +22,26 @@ impl<S: Subscriber> Filter<S> for TeloxideNoiseFilter {
} }
pub fn log_init() { pub fn log_init() {
let log_appender = RollingFileAppender::builder() // let log_appender = RollingFileAppender::builder()
.rotation(Rotation::DAILY) // .rotation(Rotation::DAILY)
.filename_prefix("mk-dl-bot.log") // .filename_prefix("mk-dl-bot.log")
.max_log_files(7) // .max_log_files(7)
.build(VAR_LOG) // .build(VAR_LOG)
.unwrap(); // .unwrap();
let stderr_layer = fmt::layer() // let file_layer = fmt::layer()
.with_writer(io::stderr) // .with_ansi(false)
.with_filter(TeloxideNoiseFilter {}) // .with_writer(log_appender)
.with_filter(LevelFilter::ERROR); // .with_filter(TeloxideNoiseFilter {})
// .with_filter(LevelFilter::INFO);
let file_layer = fmt::layer() let stdout_layer = fmt::layer()
.with_ansi(false) .with_writer(io::stdout)
.with_writer(log_appender)
.with_filter(TeloxideNoiseFilter {}) .with_filter(TeloxideNoiseFilter {})
.with_filter(LevelFilter::INFO); .with_filter(LevelFilter::INFO);
tracing_subscriber::registry() tracing_subscriber::registry()
.with(stderr_layer) .with(stdout_layer)
.with(file_layer) //.with(file_layer)
.init(); .init();
} }

8
src/bot/util.rs
View file

@ -6,11 +6,11 @@ pub const VAR_LIB: &str = "target/debug";
#[cfg(not(debug_assertions))] #[cfg(not(debug_assertions))]
pub const VAR_LIB: &str = "/var/lib/mk-dl-bot"; pub const VAR_LIB: &str = "/var/lib/mk-dl-bot";
#[cfg(debug_assertions)] // #[cfg(debug_assertions)]
pub const VAR_LOG: &str = "target/debug"; // pub const VAR_LOG: &str = "target/debug";
#[cfg(not(debug_assertions))] // #[cfg(not(debug_assertions))]
pub const VAR_LOG: &str = "/var/log/mk-dl-bot"; // pub const VAR_LOG: &str = "/var/log/mk-dl-bot";
pub fn make_database_url() -> String { pub fn make_database_url() -> String {
let path = Path::new(VAR_LIB).join("mk-dl-bot.db"); let path = Path::new(VAR_LIB).join("mk-dl-bot.db");