diff --git a/deploy/fail2ban/filter.d/reverse-proxy.conf b/deploy/fail2ban/filter.d/reverse-proxy.conf index 77fe452..52203b4 100644 --- a/deploy/fail2ban/filter.d/reverse-proxy.conf +++ b/deploy/fail2ban/filter.d/reverse-proxy.conf @@ -1,3 +1,3 @@ [Definition] -failregex = ^RATE_LIMIT client_ip= host=\S+ path=\S+ status=\d+$ +failregex = RATE_LIMIT client_ip= host=\S+ path=\S+ status=\d+ ignoreregex = \ No newline at end of file diff --git a/src/logging/mod.rs b/src/logging/mod.rs index 4ebcda3..2075170 100644 --- a/src/logging/mod.rs +++ b/src/logging/mod.rs @@ -51,7 +51,7 @@ fn init_json(env_filter: EnvFilter, log_file_path: &Option, level: Level } None => { let layer = tracing_subscriber::fmt::layer() - .json() + .with_ansi(false) .with_filter(env_filter); tracing_subscriber::registry().with(layer).try_init()?; } @@ -72,8 +72,11 @@ fn init_text(env_filter: EnvFilter, log_file_path: &Option, level: Level let file_writer = Arc::new(file); let file_env_filter = make_env_filter(level); - let stdout_layer = tracing_subscriber::fmt::layer().with_filter(env_filter); + let stdout_layer = tracing_subscriber::fmt::layer() + .with_ansi(false) + .with_filter(env_filter); let file_layer = tracing_subscriber::fmt::layer() + .with_ansi(false) .with_writer(file_writer) .with_filter(file_env_filter); tracing_subscriber::registry() @@ -82,7 +85,9 @@ fn init_text(env_filter: EnvFilter, log_file_path: &Option, level: Level .try_init()?; } None => { - let layer = tracing_subscriber::fmt::layer().with_filter(env_filter); + let layer = tracing_subscriber::fmt::layer() + .with_ansi(false) + .with_filter(env_filter); tracing_subscriber::registry().with(layer).try_init()?; } }