@@ -321,7 +321,7 @@ impl Builder {
321
321
LogTarget :: Stderr => fern:: Output :: from ( std:: io:: stderr ( ) ) ,
322
322
LogTarget :: Folder ( path) => {
323
323
if !path. exists ( ) {
324
- fs:: create_dir_all ( path) . unwrap ( ) ;
324
+ fs:: create_dir_all ( path) ? ;
325
325
}
326
326
327
327
fern:: log_file ( get_log_file_path (
@@ -334,9 +334,12 @@ impl Builder {
334
334
. into ( )
335
335
}
336
336
LogTarget :: LogDir => {
337
- let path = app_handle. path_resolver ( ) . app_log_dir ( ) . unwrap ( ) ;
337
+ let path = app_handle
338
+ . path_resolver ( )
339
+ . app_log_dir ( )
340
+ . ok_or ( "app_log_dir is None" ) ?;
338
341
if !path. exists ( ) {
339
- fs:: create_dir_all ( & path) . unwrap ( ) ;
342
+ fs:: create_dir_all ( & path) ? ;
340
343
}
341
344
342
345
fern:: log_file ( get_log_file_path (
@@ -358,7 +361,7 @@ impl Builder {
358
361
} ;
359
362
let app_handle = app_handle. clone ( ) ;
360
363
tauri:: async_runtime:: spawn ( async move {
361
- app_handle. emit_all ( "log://log" , payload) . unwrap ( ) ;
364
+ let _ = app_handle. emit_all ( "log://log" , payload) ;
362
365
} ) ;
363
366
} )
364
367
}
@@ -392,21 +395,20 @@ fn get_log_file_path(
392
395
log_name,
393
396
timezone_strategy
394
397
. get_now( )
395
- . format(
396
- & time:: format_description:: parse(
397
- "[year]-[month]-[day]_[hour]-[minute]-[second]"
398
- )
399
- . unwrap( )
400
- )
401
- . unwrap( ) ,
398
+ . format( & time:: format_description:: parse(
399
+ "[year]-[month]-[day]_[hour]-[minute]-[second]"
400
+ ) ?) ?,
402
401
) ) ;
403
402
if to. is_file ( ) {
404
403
// designated rotated log file name already exists
405
404
// highly unlikely but defensively handle anyway by adding .bak to filename
406
405
let mut to_bak = to. clone ( ) ;
407
406
to_bak. set_file_name ( format ! (
408
407
"{}.bak" ,
409
- to_bak. file_name( ) . unwrap( ) . to_string_lossy( )
408
+ to_bak
409
+ . file_name( )
410
+ . map( |n| n. to_string_lossy( ) )
411
+ . unwrap_or_default( )
410
412
) ) ;
411
413
fs:: rename ( & to, to_bak) ?;
412
414
}
0 commit comments