Skip to content

Commit

Permalink
Fix logs, improved clean up (#5454)
Browse files Browse the repository at this point in the history
Co-authored-by: Ubuntu <azureuser@debug.wciqoipclkaejnvszvrhsyebkf.bx.internal.cloudapp.net>
  • Loading branch information
huguesBouvier and Ubuntu authored Sep 1, 2021
1 parent 358aeb7 commit febd7a2
Showing 1 changed file with 17 additions and 8 deletions.
25 changes: 17 additions & 8 deletions edgelet/aziot-edged/src/workload_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ where
module_id: &str,
signal_socket_created: Option<Sender<()>>,
) -> Result<(), Error> {
info!("String new listener for module {}", module_id);
info!("Starting new listener for module {}", module_id);
let workload_uri = self.get_listener_uri(module_id)?;

self.spawn_listener(
Expand All @@ -219,8 +219,7 @@ where
Ok(())
}
} else {
warn!("Couldn't find a matching module Id in the list of shutdown channels");
Err(Error::from(ErrorKind::WorkloadManager))
Ok(())
}
}

Expand All @@ -240,6 +239,9 @@ where
ErrorKind::WorkloadManager
})?;

// Try to stop the listener, in case it was not stopped before.
self.stop(module_id)?;

Ok(())
}
}
Expand Down Expand Up @@ -278,17 +280,24 @@ where
// Ignore error, we don't want the server to close on error.
let server = create_socket_channel_rcv.for_each(move |module_id| match module_id {
ModuleAction::Start(module_id, sender) => {
workload_manager
.start(&module_id, Some(sender))
.unwrap_or(());
if let Err(err) = workload_manager.start(&module_id, Some(sender)) {
log_failure(Level::Warn, &err);
}

Ok(())
}
ModuleAction::Stop(module_id) => {
workload_manager.stop(&module_id).unwrap_or(());
if let Err(err) = workload_manager.stop(&module_id) {
log_failure(Level::Warn, &err);
}

Ok(())
}
ModuleAction::Remove(module_id) => {
workload_manager.remove(&module_id).unwrap_or(());
if let Err(err) = workload_manager.remove(&module_id) {
log_failure(Level::Warn, &err);
}

Ok(())
}
});
Expand Down

0 comments on commit febd7a2

Please sign in to comment.