Skip to content

Commit ae1ed75

Browse files
committed
make wrapper not crash if logger setup fails
1 parent 269411c commit ae1ed75

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

utils/src/shell_wrapper.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,22 @@ fn real_main() -> anyhow::Result<()> {
100100
}
101101

102102
fn main() {
103-
JournalLog::new()
103+
if let Err(err) = JournalLog::new()
104104
.context("When initializing journal logger")
105-
.unwrap()
106-
.with_syslog_identifier("shell-wrapper".to_string())
107-
.install()
108-
.unwrap();
105+
.and_then(|logger| {
106+
logger
107+
.with_syslog_identifier("shell-wrapper".to_string())
108+
.install()
109+
.context("When installing journal logger")
110+
})
111+
{
112+
warn!("Error while setting up journal logger: {:?}", err);
113+
}
109114

110115
log::set_max_level(LevelFilter::Info);
111116

112117
let result = real_main();
113118

114-
env::set_var("RUST_BACKTRACE", "1");
115119
let err = result.unwrap_err();
116120

117121
eprintln!("{:?}", &err);

0 commit comments

Comments
 (0)