File tree Expand file tree Collapse file tree 3 files changed +23
-10
lines changed Expand file tree Collapse file tree 3 files changed +23
-10
lines changed Original file line number Diff line number Diff line change @@ -3,6 +3,7 @@ use std::io::{Read, Write};
3
3
4
4
use rocket:: config:: Config ;
5
5
use rocket:: data:: { Limits , ToByteUnit } ;
6
+ use rocket:: log:: LogLevel ;
6
7
use serde:: { Deserialize , Serialize } ;
7
8
8
9
use crate :: dirs;
@@ -43,10 +44,12 @@ impl Default for AWConfig {
43
44
44
45
impl AWConfig {
45
46
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 ;
48
51
} else {
49
- Config :: debug_default ( )
52
+ config = Config :: release_default ( )
50
53
} ;
51
54
52
55
// Needed for bucket imports
Original file line number Diff line number Diff line change @@ -44,12 +44,19 @@ pub fn setup_logger(testing: bool) -> Result<(), fern::InitError> {
44
44
_ => default_log_level,
45
45
} ;
46
46
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
53
60
. format ( move |out, message, record| {
54
61
out. finish ( format_args ! (
55
62
"[{}][{}][{}]: {}" ,
@@ -74,7 +81,6 @@ pub fn setup_logger(testing: bool) -> Result<(), fern::InitError> {
74
81
. chain ( fern:: log_file ( logfile_path) ?) ,
75
82
)
76
83
. apply ( ) ?;
77
-
78
84
Ok ( ( ) )
79
85
}
80
86
Original file line number Diff line number Diff line change @@ -63,6 +63,10 @@ async fn main() -> Result<(), rocket::Error> {
63
63
64
64
logging:: setup_logger ( testing) . expect ( "Failed to setup logging" ) ;
65
65
66
+ if testing {
67
+ info ! ( "Running server in Testing mode" ) ;
68
+ }
69
+
66
70
let mut config = config:: create_config ( testing) ;
67
71
68
72
// set host if overridden
You can’t perform that action at this time.
0 commit comments