Clean up running spotify instances when removed from configuration (#564) #565
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
rtertiaer
commented
Dec 11, 2023
| @@ -284,6 +284,7 @@ def disconnect(self): | |||
| try: | |||
| # must use terminate as kill() cannot be intercepted | |||
| self._cproc.terminate() | |||
| self._cproc.communicate(timeout=5) | |||
There was a problem hiding this comment.
terminate() just fires off a signal; communicate actually prevents zombies from piling up. Doing things this way can also more appropriately bubble up errors caught during a timeout exception. This was ultimately not the cause of the issue tho, just a worthy improvement.
rtertiaer
commented
Dec 11, 2023
| @@ -511,7 +512,6 @@ def __init__(self, name: str, disabled: bool = False, mock: bool = False): | |||
|
|
|||
| self.connect_port: Optional[int] = None | |||
| self.mpris: Optional[MPRIS] = None | |||
| self.proc_pid: Optional[int] = None | |||
rtertiaer
commented
Dec 11, 2023
Comment on lines
-527
to
-529
| def __del__(self): | ||
| self.disconnect() | ||
|
|
There was a problem hiding this comment.
This is the actual bugfix.
Comment on lines
+572
to
+576
| self.proc.terminate() | ||
| outs, errs = self.proc.communicate(timeout=3) | ||
| except Exception as e: | ||
| print(f"failed to terminate spotify stream: {e}") | ||
| kouts, kerrs = self.proc.kill() |
There was a problem hiding this comment.
same as above - just improved process handling.
linknum23
approved these changes
Dec 12, 2023
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.
This PR fixes #564 , as well as cleans up a couple of things. The bug #564 was that even when a spotify stream was deleted from the configuration, it ran in the background. This was due to the
Spotify(PersistentStream)class overridingPersistentStream's__del__. I've removedSpotify's__del__; it appears to be detritus from before it was aPersistentStream.