diff --git a/discover_overlay/about_settings.py b/discover_overlay/about_settings.py index f623c8c..beaf3b3 100644 --- a/discover_overlay/about_settings.py +++ b/discover_overlay/about_settings.py @@ -18,7 +18,7 @@ import gi import sys from .settings import SettingsWindow -log = logging.getLogger("about_settings") +log = logging.getLogger(__name__) gi.require_version("Gtk", "3.0") # pylint: disable=wrong-import-position,wrong-import-order diff --git a/discover_overlay/autostart.py b/discover_overlay/autostart.py index de4d939..fa61519 100644 --- a/discover_overlay/autostart.py +++ b/discover_overlay/autostart.py @@ -19,7 +19,7 @@ except ModuleNotFoundError: from xdg import XDG_CONFIG_HOME as xdg_config_home from xdg import XDG_DATA_HOME as xdg_data_home -log = logging.getLogger("autostart") +log = logging.getLogger(__name__) class Autostart: """A class to assist auto-start""" diff --git a/discover_overlay/discord_connector.py b/discover_overlay/discord_connector.py index 8011759..5f8e30f 100644 --- a/discover_overlay/discord_connector.py +++ b/discover_overlay/discord_connector.py @@ -29,7 +29,7 @@ import calendar import websocket import requests -log = logging.getLogger("discord_connector") +log = logging.getLogger(__name__) class DiscordConnector: """ diff --git a/discover_overlay/discover_overlay.py b/discover_overlay/discover_overlay.py index 42b8f20..53a784d 100755 --- a/discover_overlay/discover_overlay.py +++ b/discover_overlay/discover_overlay.py @@ -40,7 +40,7 @@ try: except ModuleNotFoundError: from xdg import XDG_CONFIG_HOME as xdg_config_home -log = logging.getLogger("discover_overlay") +log = logging.getLogger(__name__) class Discover: """Main application class""" diff --git a/discover_overlay/image_getter.py b/discover_overlay/image_getter.py index 59d7928..392000f 100644 --- a/discover_overlay/image_getter.py +++ b/discover_overlay/image_getter.py @@ -25,7 +25,7 @@ gi.require_version('GdkPixbuf', '2.0') # pylint: disable=wrong-import-position from gi.repository import Gio, GdkPixbuf # nopep8 -log = logging.getLogger("image_getter") +log = logging.getLogger(__name__) class ImageGetter(): """Older attempt. Not advised as it can't manage anything but PNG. Loads to GDK Pixmap""" diff --git a/discover_overlay/overlay.py b/discover_overlay/overlay.py index 4626c5b..151f725 100644 --- a/discover_overlay/overlay.py +++ b/discover_overlay/overlay.py @@ -30,7 +30,7 @@ try: except (ImportError, ValueError): pass -log = logging.getLogger("overlay") +log = logging.getLogger(__name__) class OverlayWindow(Gtk.Window): """ diff --git a/discover_overlay/settings.py b/discover_overlay/settings.py index 3f51a96..cc3e71e 100644 --- a/discover_overlay/settings.py +++ b/discover_overlay/settings.py @@ -29,7 +29,7 @@ try: except ModuleNotFoundError: from xdg import XDG_CONFIG_HOME as xdg_config_home -log = logging.getLogger("settings") +log = logging.getLogger(__name__) class SettingsWindow(Gtk.VBox): """ diff --git a/discover_overlay/text_overlay.py b/discover_overlay/text_overlay.py index 0bd78fe..9f9fd26 100644 --- a/discover_overlay/text_overlay.py +++ b/discover_overlay/text_overlay.py @@ -23,7 +23,7 @@ gi.require_version('PangoCairo', '1.0') # pylint: disable=wrong-import-position,wrong-import-order from gi.repository import Pango, PangoCairo # nopep8 -log = logging.getLogger("text_overlay") +log = logging.getLogger(__name__) class TextOverlayWindow(OverlayWindow): """Overlay window for voice""" diff --git a/discover_overlay/text_settings.py b/discover_overlay/text_settings.py index ae07f03..f0d2125 100644 --- a/discover_overlay/text_settings.py +++ b/discover_overlay/text_settings.py @@ -23,7 +23,7 @@ from gi.repository import Gtk, Gdk # nopep8 GUILD_DEFAULT_VALUE = "0" -log = logging.getLogger("text_settings") +log = logging.getLogger(__name__) class TextSettingsWindow(SettingsWindow): """Text setting tab on settings window""" diff --git a/discover_overlay/voice_overlay.py b/discover_overlay/voice_overlay.py index 3c9666d..50fa13e 100644 --- a/discover_overlay/voice_overlay.py +++ b/discover_overlay/voice_overlay.py @@ -23,7 +23,7 @@ gi.require_version('PangoCairo', '1.0') # pylint: disable=wrong-import-position,wrong-import-order from gi.repository import Pango, PangoCairo # nopep8 -log = logging.getLogger("voice_overlay") +log = logging.getLogger(__name__) class VoiceOverlayWindow(OverlayWindow): """Overlay window for voice""" @@ -188,13 +188,10 @@ class VoiceOverlayWindow(OverlayWindow): self.needsredraw = True def set_guild_ids(self, guild_ids=tuple()): - try: + if 'connection' in self.discover: for _id in guild_ids: if _id not in self.guild_ids: self.discover.connection.req_channels(_id) - except AttributeError as _e: - log.error(_e) - pass self.guild_ids = guild_ids def set_wind_col(self):