}
}
- pub async fn quitting(mut self, ic: &InstanceConfig) {
+ pub async fn quitting(mut self, ic: Option<&InstanceConfig>) {
+ let icd = OptionPrefixColon(ic);
drop(self.tx);
match self.child.wait().await {
- Err(e) => error!("{}: also, failed to await ipif child: {}", &ic, e),
+ Err(e) => error!("{}also, failed to await ipif child: {}", icd, e),
Ok(st) => {
let stderr_timeout = Duration::from_millis(1000);
match tokio::time::timeout(stderr_timeout, self.stderr_task).await {
Err::<_,tokio::time::error::Elapsed>(_)
- => warn!("{}: ipif stderr task continues!", &ic),
- Ok(Err(e)) => error!("{}: ipif stderr task crashed: {}", &ic, e),
- Ok(Ok(Err(e))) => error!("{}: ipif stderr read failed: {}", &ic, e),
+ => warn!("{}ipif stderr task continues!", icd),
+ Ok(Err(e)) => error!("{}ipif stderr task crashed: {}", icd, e),
+ Ok(Ok(Err(e))) => error!("{}ipif stderr read failed: {}", icd, e),
Ok(Ok(Ok(()))) => { },
}
if ! st.success() {
- error!("{}: ipif process failed: {}", &ic, st);
+ error!("{}ipif process failed: {}", icd, st);
}
}
}