File tree Expand file tree Collapse file tree 3 files changed +20
-12
lines changed Expand file tree Collapse file tree 3 files changed +20
-12
lines changed Original file line number Diff line number Diff line change @@ -8,6 +8,8 @@ use std::{
88use clap:: { Arg , Parser } ;
99use thunder:: types:: THIS_SIDECHAIN ;
1010
11+ use crate :: util:: saturating_pred_level;
12+
1113const fn ipv4_socket_addr ( ipv4_octets : [ u8 ; 4 ] , port : u16 ) -> SocketAddr {
1214 let [ a, b, c, d] = ipv4_octets;
1315 let ipv4 = Ipv4Addr :: new ( a, b, c, d) ;
@@ -165,11 +167,16 @@ impl Cli {
165167 }
166168 }
167169 } ;
170+ let log_level = if self . headless {
171+ self . log_level
172+ } else {
173+ saturating_pred_level ( self . log_level )
174+ } ;
168175 Ok ( Config {
169176 datadir : self . datadir . 0 ,
170177 headless : self . headless ,
171178 log_dir,
172- log_level : self . log_level ,
179+ log_level,
173180 log_level_file : self . log_level_file ,
174181 mainchain_grpc_url : self . mainchain_grpc_url ,
175182 mnemonic_seed_phrase_path : self . mnemonic_seed_phrase_path ,
Original file line number Diff line number Diff line change @@ -17,17 +17,7 @@ mod rpc_server;
1717mod util;
1818
1919use line_buffer:: { LineBuffer , LineBufferWriter } ;
20-
21- /// Saturating predecessor of a log level
22- fn saturating_pred_level ( log_level : tracing:: Level ) -> tracing:: Level {
23- match log_level {
24- tracing:: Level :: TRACE => tracing:: Level :: DEBUG ,
25- tracing:: Level :: DEBUG => tracing:: Level :: INFO ,
26- tracing:: Level :: INFO => tracing:: Level :: WARN ,
27- tracing:: Level :: WARN => tracing:: Level :: ERROR ,
28- tracing:: Level :: ERROR => tracing:: Level :: ERROR ,
29- }
30- }
20+ use util:: saturating_pred_level;
3121
3222/// The empty string target `""` can be used to set a default level.
3323fn targets_directive_str < ' a , Targets > ( targets : Targets ) -> String
Original file line number Diff line number Diff line change 6464 Self ( Some ( Self :: promise ( stream) ) )
6565 }
6666}
67+
68+ /// Saturating predecessor of a log level
69+ pub fn saturating_pred_level ( log_level : tracing:: Level ) -> tracing:: Level {
70+ match log_level {
71+ tracing:: Level :: TRACE => tracing:: Level :: DEBUG ,
72+ tracing:: Level :: DEBUG => tracing:: Level :: INFO ,
73+ tracing:: Level :: INFO => tracing:: Level :: WARN ,
74+ tracing:: Level :: WARN => tracing:: Level :: ERROR ,
75+ tracing:: Level :: ERROR => tracing:: Level :: ERROR ,
76+ }
77+ }
You can’t perform that action at this time.
0 commit comments