This repository has been archived by the owner on Nov 6, 2020. It is now read-only.
Sweep panickers from IO and network #3018
Merged
Conversation
This file contains 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
arkpar
added
A0-pleasereview 🤓
rphmeier
reviewed
Oct 31, 2016
| @@ -399,8 +399,8 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static { | |||
| let thread = thread::spawn(move || { | |||
| let p = panic.clone(); | |||
| panic.catch_panic(move || { | |||
| IoManager::<Message>::start(p, &mut event_loop, h).unwrap(); | |||
| }).unwrap() | |||
| IoManager::<Message>::start(p, &mut event_loop, h).expect("Error startting IO service"); | |||
rphmeier
reviewed
Oct 31, 2016
| @@ -434,7 +434,9 @@ impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone { | |||
| fn drop(&mut self) { | |||
| trace!(target: "shutdown", "[IoService] Closing..."); | |||
| self.host_channel.lock().send(IoMessage::Shutdown).unwrap_or_else(|e| warn!("Error on IO service shutdown: {:?}", e)); | |||
| self.thread.take().unwrap().join().ok(); | |||
| if let Some(thread) = self.thread.take() { | |||
| thread.join().ok(); | |||
There was a problem hiding this comment.
could warn/log when result not ok -- seems to just silence errors here.
rphmeier
added
A8-looksgood 🦄
|
Changes Unknown when pulling bca041a on panic-sweep into * on master*. |
|
Changes Unknown when pulling bca041a on panic-sweep into * on master*. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
#1026