stream.segmented: join worker+writer on close #4517
Merged
Conversation
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
|
Another approach: In def close(self):
self.worker.close()
self.writer.close()
self.buffer.close()
+ try:
+ self.writer.join()
+ except RuntimeError:
+ pass
+ try:
+ self.worker.join()
+ except RuntimeError:
+ pass
Note about the try-catch: Since |
bastimeyer
reviewed
May 8, 2022
There was a problem hiding this comment.
Thanks for the PR.
The following diff should be enough to fix the issue with the SegmentedStreamWorker and SegmentedStreamWriter deamon threads. No need to add a special method to SegmentedStreamReader, which is just one of the stream (base) classes, and catching an AttributeError when trying to call this method from the CLI on other stream implementations that don't have this method.
diff --git a/src/streamlink/stream/segmented.py b/src/streamlink/stream/segmented.py
index d097be24..26fbdac1 100644
--- a/src/streamlink/stream/segmented.py
+++ b/src/streamlink/stream/segmented.py
@@ -3,7 +3,7 @@ import queue
from concurrent import futures
from concurrent.futures import Future, ThreadPoolExecutor
from sys import version_info
-from threading import Event, Thread
+from threading import Event, Thread, current_thread
from typing import Any, Optional
from streamlink.buffers import RingBuffer
@@ -228,6 +228,12 @@ class SegmentedStreamReader(StreamIO):
self.writer.close()
self.buffer.close()
+ current = current_thread()
+ if current is not self.worker: # pragma: no branch
+ self.worker.join(timeout=self.timeout)
+ if current is not self.writer: # pragma: no branch
+ self.writer.join(timeout=self.timeout)
+
def read(self, size):
return self.buffer.read(
size,…SegmentedStreamWriter to finish. Thanks @bastimeyer
bastimeyer
changed the title
Billy2011
added a commit
to Billy2011/streamlink-27
that referenced
this pull request
May 8, 2022
light4
pushed a commit
to light4/streamlink
that referenced
this pull request
Dec 9, 2022
Co-authored-by: bastimeyer <mail@bastimeyer.de>
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.
A simple, maybe ulgy, attempt to fix #4516 .
There may be more beautiful approaches.