@@ -39,8 +39,8 @@ use reqwest::Client;
39
39
use rustix:: stdio:: stdout;
40
40
// FIXME: `spdlog::error` is conflict with `mod error`
41
41
use spdlog:: {
42
- Level , LevelFilter , Logger , debug, default_logger , info, init_log_crate_proxy,
43
- prelude:: error,
42
+ Level , LevelFilter , Logger , debug, info, init_log_crate_proxy,
43
+ prelude:: error as error2 ,
44
44
set_default_logger,
45
45
sink:: { AsyncPoolSink , RotatingFileSink , RotationPolicy , StdStreamSink } ,
46
46
warn,
@@ -188,7 +188,7 @@ fn main() {
188
188
console_subscriber:: init ( ) ;
189
189
190
190
#[ cfg( not( feature = "tokio-console" ) ) ]
191
- let ( _guard , file) = init_logger ( & oma, & config) ;
191
+ let file = init_logger ( & oma, & config) ;
192
192
193
193
debug ! (
194
194
"Run oma with args: {} (pid: {})" ,
@@ -284,10 +284,7 @@ fn init_localizer() {
284
284
LANGUAGE_LOADER . set_use_isolating ( false ) ;
285
285
}
286
286
287
- fn init_logger (
288
- oma : & OhManagerAilurus ,
289
- config : & Config ,
290
- ) -> ( Option < Arc < Logger > > , anyhow:: Result < String > ) {
287
+ fn init_logger ( oma : & OhManagerAilurus , config : & Config ) -> anyhow:: Result < String > {
291
288
let debug = oma. global . debug ;
292
289
let dry_run = oma. global . dry_run ;
293
290
@@ -350,9 +347,9 @@ fn init_logger(
350
347
let logger = logger_builder. build ( ) . unwrap ( ) ;
351
348
352
349
set_default_logger ( Arc :: new ( logger) ) ;
353
- init_log_crate_proxy ( ) ? ;
350
+ init_log_crate_proxy ( ) . unwrap ( ) ;
354
351
355
- ( Some ( default_logger ( ) ) , Ok ( log_file ) )
352
+ Ok ( log_file . to_string_lossy ( ) . to_string ( ) )
356
353
}
357
354
358
355
#[ inline]
0 commit comments