File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -29,18 +29,22 @@ pub fn init_logger() -> Result<()> {
2929
3030 let fmt_layer = fmt:: layer ( ) . compact ( ) ;
3131
32- match journald:: layer ( ) {
33- Ok ( journald_layer) => tracing_subscriber:: registry ( )
32+ match ( !crate :: utils:: env:: bool_var ( "COSMIC_DISABLE_JOURNALD" ) . unwrap_or ( false ) )
33+ . then ( || journald:: layer ( ) )
34+ {
35+ Some ( Ok ( journald_layer) ) => tracing_subscriber:: registry ( )
3436 . with ( fmt_layer)
3537 . with ( journald_layer)
3638 . with ( filter)
3739 . init ( ) ,
38- Err ( err ) => {
40+ x @ None | x @ Some ( Err ( _ ) ) => {
3941 tracing_subscriber:: registry ( )
4042 . with ( fmt_layer)
4143 . with ( filter)
4244 . init ( ) ;
43- warn ! ( ?err, "Failed to init journald logging." ) ;
45+ if let Some ( Err ( err) ) = x {
46+ warn ! ( ?err, "Failed to init journald logging." ) ;
47+ }
4448 }
4549 } ;
4650 log_panics:: init ( ) ;
You can’t perform that action at this time.
0 commit comments