fix: remove extraneous log output wrt stopping icx-proxy#1839
Merged
mergify[bot] merged 2 commits intomasterfrom Sep 28, 2021
Merged
fix: remove extraneous log output wrt stopping icx-proxy#1839mergify[bot] merged 2 commits intomasterfrom
mergify[bot] merged 2 commits intomasterfrom
Conversation
When dfx starts, it logs "Stopping icx-proxy..." "Stopped" when it didn't actually do that.
krpeacock
approved these changes
Sep 27, 2021
Contributor
|
Would this perhaps be any clearer? fn stop_icx_proxy(&mut self) {
if let Some(sender) = self.stop_sender.take() {
info!(self.logger, "Stopping icx-proxy...");
sender.send(()).unwrap();
info!(self.logger, "Stopped.");
} else if let Some(join) = self.thread_join.take() {
info!(self.logger, "Stopping icx-proxy...");
join.join().unwrap();
info!(self.logger, "Stopped.");
}
} |
Author
|
No, the normal case is that both are Some, and the stop sequence is:
|
…icx-proxy-stopping
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
When dfx starts, it logs "Stopping icx-proxy..." "Stopped" when it didn't actually do that.