From e67ac104727910960aacc6a6346e3a329403ba8b Mon Sep 17 00:00:00 2001 From: Imayhaveborkedit Date: Sun, 3 Sep 2023 02:41:16 -0400 Subject: [PATCH] Normalize thread names Every thread now has a name and either a contextually relevant identifier or their in hex to disambiguate multiple threads of the same type. Also finally gets rid of that old python 2 style init call. --- discord/player.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/discord/player.py b/discord/player.py index 1792abc71..83a8a5e89 100644 --- a/discord/player.py +++ b/discord/player.py @@ -187,13 +187,13 @@ class FFmpegAudio(AudioSource): self._pipe_reader_thread: Optional[threading.Thread] = None if piping_stdin: - n = f'popen-stdin-writer:{id(self):#x}' + n = f'popen-stdin-writer:pid-{self._process.pid}' self._stdin = self._process.stdin self._pipe_writer_thread = threading.Thread(target=self._pipe_writer, args=(source,), daemon=True, name=n) self._pipe_writer_thread.start() if piping_stderr: - n = f'popen-stderr-reader:{id(self):#x}' + n = f'popen-stderr-reader:pid-{self._process.pid}' self._stderr = self._process.stderr self._pipe_reader_thread = threading.Thread(target=self._pipe_reader, args=(stderr,), daemon=True, name=n) self._pipe_reader_thread.start() @@ -693,8 +693,7 @@ class AudioPlayer(threading.Thread): *, after: Optional[Callable[[Optional[Exception]], Any]] = None, ) -> None: - threading.Thread.__init__(self) - self.daemon: bool = True + super().__init__(daemon=True, name=f'audio-player:{id(self):#x}') self.source: AudioSource = source self.client: VoiceClient = client self.after: Optional[Callable[[Optional[Exception]], Any]] = after