diff --git a/mopidy/__main__.py b/mopidy/__main__.py index 6a6c0eb8..2e6a6cc5 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -29,7 +29,7 @@ from mopidy import commands, ext from mopidy import config as config_lib from mopidy.utils import log, path, process, versioning -logger = logging.getLogger('mopidy.main') +logger = logging.getLogger(__name__) def main(): diff --git a/mopidy/audio/actor.py b/mopidy/audio/actor.py index 5c931865..feeee820 100644 --- a/mopidy/audio/actor.py +++ b/mopidy/audio/actor.py @@ -15,7 +15,7 @@ from . import mixers, playlists, utils from .constants import PlaybackState from .listener import AudioListener -logger = logging.getLogger('mopidy.audio') +logger = logging.getLogger(__name__) mixers.register_mixers() diff --git a/mopidy/audio/mixers/auto.py b/mopidy/audio/mixers/auto.py index 023674bf..7e59b602 100644 --- a/mopidy/audio/mixers/auto.py +++ b/mopidy/audio/mixers/auto.py @@ -12,7 +12,7 @@ import gst import logging -logger = logging.getLogger('mopidy.audio.mixers.auto') +logger = logging.getLogger(__name__) # TODO: we might want to add some ranking to the mixers we know about? diff --git a/mopidy/backends/local/__init__.py b/mopidy/backends/local/__init__.py index dedc868c..e9204338 100644 --- a/mopidy/backends/local/__init__.py +++ b/mopidy/backends/local/__init__.py @@ -7,7 +7,7 @@ import mopidy from mopidy import config, ext from mopidy.utils import encoding, path -logger = logging.getLogger('mopidy.backends.local') +logger = logging.getLogger(__name__) class Extension(ext.Extension): diff --git a/mopidy/backends/local/actor.py b/mopidy/backends/local/actor.py index a73f627e..a9902c8b 100644 --- a/mopidy/backends/local/actor.py +++ b/mopidy/backends/local/actor.py @@ -11,7 +11,7 @@ from mopidy.utils import encoding, path from .playlists import LocalPlaylistsProvider from .playback import LocalPlaybackProvider -logger = logging.getLogger('mopidy.backends.local') +logger = logging.getLogger(__name__) class LocalBackend(pykka.ThreadingActor, base.Backend): diff --git a/mopidy/backends/local/commands.py b/mopidy/backends/local/commands.py index 5e9b42e6..e9eb807c 100644 --- a/mopidy/backends/local/commands.py +++ b/mopidy/backends/local/commands.py @@ -10,7 +10,7 @@ from mopidy.utils import path from . import translator -logger = logging.getLogger('mopidy.backends.local.commands') +logger = logging.getLogger(__name__) class LocalCommand(commands.Command): diff --git a/mopidy/backends/local/json/actor.py b/mopidy/backends/local/json/actor.py index 66a6fbd5..4fc46417 100644 --- a/mopidy/backends/local/json/actor.py +++ b/mopidy/backends/local/json/actor.py @@ -10,7 +10,7 @@ from mopidy.utils import encoding from . import library -logger = logging.getLogger('mopidy.backends.local.json') +logger = logging.getLogger(__name__) class LocalJsonBackend(pykka.ThreadingActor, base.Backend): diff --git a/mopidy/backends/local/json/library.py b/mopidy/backends/local/json/library.py index 33427231..99640543 100644 --- a/mopidy/backends/local/json/library.py +++ b/mopidy/backends/local/json/library.py @@ -11,7 +11,7 @@ from mopidy import models from mopidy.backends import base from mopidy.backends.local import search -logger = logging.getLogger('mopidy.backends.local.json') +logger = logging.getLogger(__name__) def load_library(json_file): diff --git a/mopidy/backends/local/playback.py b/mopidy/backends/local/playback.py index ae8eeb82..6ef7b410 100644 --- a/mopidy/backends/local/playback.py +++ b/mopidy/backends/local/playback.py @@ -6,7 +6,7 @@ from mopidy.backends import base from . import translator -logger = logging.getLogger('mopidy.backends.local') +logger = logging.getLogger(__name__) class LocalPlaybackProvider(base.BasePlaybackProvider): diff --git a/mopidy/backends/local/playlists.py b/mopidy/backends/local/playlists.py index e8996b51..9e2459c6 100644 --- a/mopidy/backends/local/playlists.py +++ b/mopidy/backends/local/playlists.py @@ -12,7 +12,7 @@ from mopidy.utils import formatting, path from .translator import parse_m3u -logger = logging.getLogger('mopidy.backends.local') +logger = logging.getLogger(__name__) class LocalPlaylistsProvider(base.BasePlaylistsProvider): diff --git a/mopidy/backends/local/translator.py b/mopidy/backends/local/translator.py index 243eb314..8cc3df81 100644 --- a/mopidy/backends/local/translator.py +++ b/mopidy/backends/local/translator.py @@ -8,7 +8,7 @@ import urllib from mopidy.utils.encoding import locale_decode from mopidy.utils.path import path_to_uri, uri_to_path -logger = logging.getLogger('mopidy.backends.local') +logger = logging.getLogger(__name__) def local_track_uri_to_file_uri(uri, media_dir): diff --git a/mopidy/backends/stream/actor.py b/mopidy/backends/stream/actor.py index c807e09d..a5b2a539 100644 --- a/mopidy/backends/stream/actor.py +++ b/mopidy/backends/stream/actor.py @@ -10,7 +10,7 @@ from mopidy.audio import scan from mopidy.backends import base from mopidy.models import Track -logger = logging.getLogger('mopidy.backends.stream') +logger = logging.getLogger(__name__) class StreamBackend(pykka.ThreadingActor, base.Backend): diff --git a/mopidy/commands.py b/mopidy/commands.py index ba5a42f1..46989c9c 100644 --- a/mopidy/commands.py +++ b/mopidy/commands.py @@ -14,7 +14,7 @@ from mopidy.audio import Audio from mopidy.core import Core from mopidy.utils import deps, process, versioning -logger = logging.getLogger('mopidy.commands') +logger = logging.getLogger(__name__) _default_config = [] for base in glib.get_system_config_dirs() + (glib.get_user_config_dir(),): diff --git a/mopidy/config/__init__.py b/mopidy/config/__init__.py index f68567e7..d6400fad 100644 --- a/mopidy/config/__init__.py +++ b/mopidy/config/__init__.py @@ -12,7 +12,7 @@ from mopidy.config.schemas import * # noqa from mopidy.config.types import * # noqa from mopidy.utils import path, versioning -logger = logging.getLogger('mopidy.config') +logger = logging.getLogger(__name__) _logging_schema = ConfigSchema('logging') _logging_schema['console_format'] = String() diff --git a/mopidy/config/keyring.py b/mopidy/config/keyring.py index 169ffdd1..6800d2c4 100644 --- a/mopidy/config/keyring.py +++ b/mopidy/config/keyring.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import logging -logger = logging.getLogger('mopidy.config.keyring') +logger = logging.getLogger(__name__) try: import dbus diff --git a/mopidy/core/playback.py b/mopidy/core/playback.py index 3c0e43fa..96d13017 100644 --- a/mopidy/core/playback.py +++ b/mopidy/core/playback.py @@ -8,7 +8,7 @@ from mopidy.audio import PlaybackState from . import listener -logger = logging.getLogger('mopidy.core') +logger = logging.getLogger(__name__) class PlaybackController(object): diff --git a/mopidy/core/tracklist.py b/mopidy/core/tracklist.py index d3cc0d75..816e7b65 100644 --- a/mopidy/core/tracklist.py +++ b/mopidy/core/tracklist.py @@ -9,7 +9,7 @@ from mopidy.models import TlTrack from . import listener -logger = logging.getLogger('mopidy.core') +logger = logging.getLogger(__name__) class TracklistController(object): diff --git a/mopidy/ext.py b/mopidy/ext.py index feadc99f..33b9497d 100644 --- a/mopidy/ext.py +++ b/mopidy/ext.py @@ -7,7 +7,7 @@ from mopidy import exceptions from mopidy import config as config_lib -logger = logging.getLogger('mopidy.ext') +logger = logging.getLogger(__name__) class Extension(object): diff --git a/mopidy/http/actor.py b/mopidy/http/actor.py index cc7c11a1..037fe1ea 100644 --- a/mopidy/http/actor.py +++ b/mopidy/http/actor.py @@ -14,7 +14,7 @@ from mopidy.core import CoreListener from . import ws -logger = logging.getLogger('mopidy.http') +logger = logging.getLogger(__name__) class HttpFrontend(pykka.ThreadingActor, CoreListener): diff --git a/mopidy/http/ws.py b/mopidy/http/ws.py index 5a0f2039..4d7aa9a2 100644 --- a/mopidy/http/ws.py +++ b/mopidy/http/ws.py @@ -9,7 +9,7 @@ from mopidy import core, models from mopidy.utils import jsonrpc -logger = logging.getLogger('mopidy.http') +logger = logging.getLogger(__name__) class WebSocketResource(object): diff --git a/mopidy/listener.py b/mopidy/listener.py index 715beb03..cce5556d 100644 --- a/mopidy/listener.py +++ b/mopidy/listener.py @@ -5,7 +5,7 @@ import logging import gobject import pykka -logger = logging.getLogger('mopidy.listener') +logger = logging.getLogger(__name__) def send_async(cls, event, **kwargs): diff --git a/mopidy/mpd/actor.py b/mopidy/mpd/actor.py index 9c33faaa..144b09d5 100644 --- a/mopidy/mpd/actor.py +++ b/mopidy/mpd/actor.py @@ -10,7 +10,7 @@ from mopidy.core import CoreListener from mopidy.mpd import session from mopidy.utils import encoding, network, process -logger = logging.getLogger('mopidy.mpd') +logger = logging.getLogger(__name__) class MpdFrontend(pykka.ThreadingActor, CoreListener): diff --git a/mopidy/mpd/dispatcher.py b/mopidy/mpd/dispatcher.py index c3881f6f..4ddb4025 100644 --- a/mopidy/mpd/dispatcher.py +++ b/mopidy/mpd/dispatcher.py @@ -7,7 +7,7 @@ import pykka from mopidy.mpd import exceptions, protocol -logger = logging.getLogger('mopidy.mpd.dispatcher') +logger = logging.getLogger(__name__) protocol.load_protocol_modules() diff --git a/mopidy/mpd/session.py b/mopidy/mpd/session.py index 5a531a79..2c0bd840 100644 --- a/mopidy/mpd/session.py +++ b/mopidy/mpd/session.py @@ -5,7 +5,7 @@ import logging from mopidy.mpd import dispatcher, protocol from mopidy.utils import formatting, network -logger = logging.getLogger('mopidy.mpd') +logger = logging.getLogger(__name__) class MpdSession(network.LineProtocol): diff --git a/mopidy/utils/network.py b/mopidy/utils/network.py index 1ffb12d6..bb1edbc4 100644 --- a/mopidy/utils/network.py +++ b/mopidy/utils/network.py @@ -12,7 +12,7 @@ import pykka from mopidy.utils import encoding -logger = logging.getLogger('mopidy.utils.server') +logger = logging.getLogger(__name__) class ShouldRetrySocketCall(Exception): diff --git a/mopidy/utils/path.py b/mopidy/utils/path.py index b8dcc589..29e8077e 100644 --- a/mopidy/utils/path.py +++ b/mopidy/utils/path.py @@ -9,7 +9,7 @@ import urlparse import glib -logger = logging.getLogger('mopidy.utils.path') +logger = logging.getLogger(__name__) XDG_DIRS = { diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index c8e3e558..0660efe0 100644 --- a/mopidy/utils/process.py +++ b/mopidy/utils/process.py @@ -8,7 +8,7 @@ import threading from pykka import ActorDeadError from pykka.registry import ActorRegistry -logger = logging.getLogger('mopidy.utils.process') +logger = logging.getLogger(__name__) SIGNALS = dict( (k, v) for v, k in signal.__dict__.iteritems() diff --git a/mopidy/zeroconf.py b/mopidy/zeroconf.py index 671bebc7..e95b1792 100644 --- a/mopidy/zeroconf.py +++ b/mopidy/zeroconf.py @@ -4,7 +4,7 @@ import logging import socket import string -logger = logging.getLogger('mopidy.zeroconf') +logger = logging.getLogger(__name__) try: import dbus