From fbe3383b661d07ef03eabb83477fe7b2e4b445bf Mon Sep 17 00:00:00 2001 From: Terry Geng Date: Sat, 9 May 2020 20:49:52 +0800 Subject: [PATCH] fix: avoid confusing error message when connection to the murmur server fails. --- mumbleBot.py | 5 +++++ util.py | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mumbleBot.py b/mumbleBot.py index 033c074..62e3a2b 100644 --- a/mumbleBot.py +++ b/mumbleBot.py @@ -13,6 +13,7 @@ import argparse import os import os.path import pymumble_py3 as pymumble +import pymumble_py3.constants import variables as var import logging import logging.handlers @@ -123,6 +124,10 @@ class MumbleBot: self.mumble.set_codec_profile("audio") self.mumble.start() # start the mumble thread self.mumble.is_ready() # wait for the connection + + if self.mumble.connected >= pymumble_py3.constants.PYMUMBLE_CONN_STATE_FAILED: + exit() + self.set_comment() self.mumble.users.myself.unmute() # by sure the user is not muted self.join_channel() diff --git a/util.py b/util.py index 7da3886..1fe009b 100644 --- a/util.py +++ b/util.py @@ -345,7 +345,10 @@ class LoggerIOWrapper(io.TextIOWrapper): def write(self, text): if isinstance(text, bytes): - self.logger.log(self.logging_level, text.decode('utf-8').rstrip()) + msg = text.decode('utf-8').rstrip() + self.logger.log(self.logging_level, msg) + super().write(msg + "\n") else: self.logger.log(self.logging_level, text.rstrip()) + super().write(text + "\n")