instead of file logging we're going to use stdout because bot will be run in container, therefore container output is a log
This commit is contained in:
parent
3ecbbd4ad2
commit
754397604b
2 changed files with 21 additions and 21 deletions
|
|
@ -1,9 +1,9 @@
|
|||
use std::io;
|
||||
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 super::util::VAR_LOG;
|
||||
//use super::util::VAR_LOG;
|
||||
|
||||
// A layer filter to prevent polling timeout errors from clogging logs
|
||||
struct TeloxideNoiseFilter {}
|
||||
|
|
@ -22,26 +22,26 @@ impl<S: Subscriber> Filter<S> for TeloxideNoiseFilter {
|
|||
}
|
||||
|
||||
pub fn log_init() {
|
||||
let log_appender = RollingFileAppender::builder()
|
||||
.rotation(Rotation::DAILY)
|
||||
.filename_prefix("mk-dl-bot.log")
|
||||
.max_log_files(7)
|
||||
.build(VAR_LOG)
|
||||
.unwrap();
|
||||
// let log_appender = RollingFileAppender::builder()
|
||||
// .rotation(Rotation::DAILY)
|
||||
// .filename_prefix("mk-dl-bot.log")
|
||||
// .max_log_files(7)
|
||||
// .build(VAR_LOG)
|
||||
// .unwrap();
|
||||
|
||||
let stderr_layer = fmt::layer()
|
||||
.with_writer(io::stderr)
|
||||
.with_filter(TeloxideNoiseFilter {})
|
||||
.with_filter(LevelFilter::ERROR);
|
||||
// let file_layer = fmt::layer()
|
||||
// .with_ansi(false)
|
||||
// .with_writer(log_appender)
|
||||
// .with_filter(TeloxideNoiseFilter {})
|
||||
// .with_filter(LevelFilter::INFO);
|
||||
|
||||
let file_layer = fmt::layer()
|
||||
.with_ansi(false)
|
||||
.with_writer(log_appender)
|
||||
let stdout_layer = fmt::layer()
|
||||
.with_writer(io::stdout)
|
||||
.with_filter(TeloxideNoiseFilter {})
|
||||
.with_filter(LevelFilter::INFO);
|
||||
|
||||
tracing_subscriber::registry()
|
||||
.with(stderr_layer)
|
||||
.with(file_layer)
|
||||
.with(stdout_layer)
|
||||
//.with(file_layer)
|
||||
.init();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@ pub const VAR_LIB: &str = "target/debug";
|
|||
#[cfg(not(debug_assertions))]
|
||||
pub const VAR_LIB: &str = "/var/lib/mk-dl-bot";
|
||||
|
||||
#[cfg(debug_assertions)]
|
||||
pub const VAR_LOG: &str = "target/debug";
|
||||
// #[cfg(debug_assertions)]
|
||||
// pub const VAR_LOG: &str = "target/debug";
|
||||
|
||||
#[cfg(not(debug_assertions))]
|
||||
pub const VAR_LOG: &str = "/var/log/mk-dl-bot";
|
||||
// #[cfg(not(debug_assertions))]
|
||||
// pub const VAR_LOG: &str = "/var/log/mk-dl-bot";
|
||||
|
||||
pub fn make_database_url() -> String {
|
||||
let path = Path::new(VAR_LIB).join("mk-dl-bot.db");
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue