Skip to content

Commit 5bd70f9

Browse files
fix: extra debug logging when in testing mode (#310)
Co-authored-by: Erik Bjäreholt <erik@bjareho.lt>
1 parent 922f9b3 commit 5bd70f9

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

aw-server/src/config.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use std::io::{Read, Write};
33

44
use rocket::config::Config;
55
use rocket::data::{Limits, ToByteUnit};
6+
use rocket::log::LogLevel;
67
use serde::{Deserialize, Serialize};
78

89
use crate::dirs;
@@ -43,10 +44,12 @@ impl Default for AWConfig {
4344

4445
impl AWConfig {
4546
pub fn to_rocket_config(&self) -> rocket::Config {
46-
let mut config = if self.testing {
47-
Config::release_default()
47+
let mut config;
48+
if self.testing {
49+
config = Config::debug_default();
50+
config.log_level = LogLevel::Debug;
4851
} else {
49-
Config::debug_default()
52+
config = Config::release_default()
5053
};
5154

5255
// Needed for bucket imports

aw-server/src/logging.rs

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,19 @@ pub fn setup_logger(testing: bool) -> Result<(), fern::InitError> {
4444
_ => default_log_level,
4545
};
4646

47-
fern::Dispatch::new()
48-
// Set some Rocket messages to debug level
49-
.level(log_level)
50-
.level_for("rocket", log::LevelFilter::Warn)
51-
.level_for("_", log::LevelFilter::Warn) // Rocket requests
52-
.level_for("launch_", log::LevelFilter::Warn) // Rocket config info
47+
let mut dispatch = fern::Dispatch::new().level(log_level);
48+
// Set some Rocket messages to debug level
49+
50+
let is_debug = matches!(log_level, log::LevelFilter::Trace | log::LevelFilter::Debug);
51+
if is_debug {
52+
dispatch = dispatch
53+
.level_for("rocket", log::LevelFilter::Warn)
54+
.level_for("_", log::LevelFilter::Warn) // Rocket requests
55+
.level_for("launch_", log::LevelFilter::Warn); // Rocket config info
56+
}
57+
58+
dispatch
59+
// Formatting
5360
.format(move |out, message, record| {
5461
out.finish(format_args!(
5562
"[{}][{}][{}]: {}",
@@ -74,7 +81,6 @@ pub fn setup_logger(testing: bool) -> Result<(), fern::InitError> {
7481
.chain(fern::log_file(logfile_path)?),
7582
)
7683
.apply()?;
77-
7884
Ok(())
7985
}
8086

aw-server/src/main.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ async fn main() -> Result<(), rocket::Error> {
6363

6464
logging::setup_logger(testing).expect("Failed to setup logging");
6565

66+
if testing {
67+
info!("Running server in Testing mode");
68+
}
69+
6670
let mut config = config::create_config(testing);
6771

6872
// set host if overridden

0 commit comments

Comments
 (0)