diff --git a/pype/hosts/fusion/pipeline.py b/pype/hosts/fusion/pipeline.py index 22a80076da..b2918675ea 100644 --- a/pype/hosts/fusion/pipeline.py +++ b/pype/hosts/fusion/pipeline.py @@ -9,7 +9,7 @@ from pyblish import api as pyblish from pype.api import Logger from pype import PLUGINS_DIR -log = Logger().get_logger(__name__, "fusion") +log = Logger().get_logger(__name__) AVALON_CONFIG = os.environ["AVALON_CONFIG"] diff --git a/pype/hosts/fusion/utils.py b/pype/hosts/fusion/utils.py index 15fa52e938..6eee54b5b1 100644 --- a/pype/hosts/fusion/utils.py +++ b/pype/hosts/fusion/utils.py @@ -9,7 +9,7 @@ import shutil from pype.api import Logger -log = Logger().get_logger(__name__, "fusion") +log = Logger().get_logger(__name__) def _sync_utility_scripts(env=None): diff --git a/pype/hosts/hiero/__init__.py b/pype/hosts/hiero/__init__.py index 50fd39440b..9eb3cd551a 100644 --- a/pype/hosts/hiero/__init__.py +++ b/pype/hosts/hiero/__init__.py @@ -31,7 +31,7 @@ __all__ = [ ] # get logger -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) ''' Creating all important host related variables ''' diff --git a/pype/hosts/hiero/events.py b/pype/hosts/hiero/events.py index d78f8d54d4..4f9851cbac 100644 --- a/pype/hosts/hiero/events.py +++ b/pype/hosts/hiero/events.py @@ -4,7 +4,7 @@ from pype.api import Logger from .lib import sync_avalon_data_to_workfile, launch_workfiles_app from .tags import add_tags_from_presets -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) def startupCompleted(event): diff --git a/pype/hosts/hiero/lib.py b/pype/hosts/hiero/lib.py index 0db9b92b3d..182d7e53c0 100644 --- a/pype/hosts/hiero/lib.py +++ b/pype/hosts/hiero/lib.py @@ -9,7 +9,7 @@ from avalon.vendor.Qt import (QtWidgets, QtGui) import pype.api as pype from pype.api import Logger, Anatomy -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) cached_process = None diff --git a/pype/hosts/hiero/menu.py b/pype/hosts/hiero/menu.py index 697381f3cb..853ee8cf7e 100644 --- a/pype/hosts/hiero/menu.py +++ b/pype/hosts/hiero/menu.py @@ -12,7 +12,7 @@ from .lib import ( set_workfiles ) -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) self = sys.modules[__name__] self._change_context_menu = None diff --git a/pype/hosts/hiero/tags.py b/pype/hosts/hiero/tags.py index 551dc1698d..af1a9b947a 100644 --- a/pype/hosts/hiero/tags.py +++ b/pype/hosts/hiero/tags.py @@ -8,7 +8,7 @@ from pprint import pformat from pype.api import Logger from avalon import io -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) def tag_data(): diff --git a/pype/hosts/hiero/workio.py b/pype/hosts/hiero/workio.py index f11a34c9a8..c3505ef1bc 100644 --- a/pype/hosts/hiero/workio.py +++ b/pype/hosts/hiero/workio.py @@ -4,7 +4,7 @@ from avalon import api from pype.api import Logger -log = Logger().get_logger(__name__, "hiero") +log = Logger().get_logger(__name__) def file_extensions(): diff --git a/pype/hosts/nuke/__init__.py b/pype/hosts/nuke/__init__.py index 787f69f635..d0f3577c2e 100644 --- a/pype/hosts/nuke/__init__.py +++ b/pype/hosts/nuke/__init__.py @@ -15,7 +15,7 @@ from . import lib self = sys.modules[__name__] self.workfiles_launched = False -log = Logger().get_logger(__name__, "nuke") +log = Logger().get_logger(__name__) AVALON_CONFIG = os.getenv("AVALON_CONFIG", "pype") diff --git a/pype/hosts/nuke/lib.py b/pype/hosts/nuke/lib.py index 50b9697d8e..ddfdd260e2 100644 --- a/pype/hosts/nuke/lib.py +++ b/pype/hosts/nuke/lib.py @@ -20,7 +20,7 @@ from .presets import ( from .utils import set_context_favorites -log = pype.Logger().get_logger(__name__, "nuke") +log = pype.Logger().get_logger(__name__) self = sys.modules[__name__] self._project = None diff --git a/pype/hosts/nuke/menu.py b/pype/hosts/nuke/menu.py index b1ef7f47c4..f35cebfde0 100644 --- a/pype/hosts/nuke/menu.py +++ b/pype/hosts/nuke/menu.py @@ -5,7 +5,7 @@ from pype.hosts.nuke import lib from ...lib import BuildWorkfile from pype.api import Logger -log = Logger().get_logger(__name__, "nuke") +log = Logger().get_logger(__name__) def install(): diff --git a/pype/hosts/nuke/presets.py b/pype/hosts/nuke/presets.py index 2a296afc88..e40459f400 100644 --- a/pype/hosts/nuke/presets.py +++ b/pype/hosts/nuke/presets.py @@ -1,7 +1,7 @@ from pype.api import Anatomy, config, Logger import nuke -log = Logger().get_logger(__name__, "nuke") +log = Logger().get_logger(__name__) def get_anatomy(**kwarg): diff --git a/pype/hosts/premiere/__init__.py b/pype/hosts/premiere/__init__.py index acba84496b..8a9a032c54 100644 --- a/pype/hosts/premiere/__init__.py +++ b/pype/hosts/premiere/__init__.py @@ -18,7 +18,7 @@ __all__ = [ "ls" ] -log = Logger().get_logger(__name__, "premiere") +log = Logger().get_logger(__name__) def install(): diff --git a/pype/hosts/premiere/lib.py b/pype/hosts/premiere/lib.py index d76d27270a..5282e2c747 100644 --- a/pype/hosts/premiere/lib.py +++ b/pype/hosts/premiere/lib.py @@ -10,7 +10,7 @@ from pype.widgets.message_window import message from pype import PLUGINS_DIR from pype.api import Logger -log = Logger().get_logger(__name__, "premiere") +log = Logger().get_logger(__name__) self = sys.modules[__name__] self._has_been_setup = False diff --git a/pype/hosts/resolve/lib.py b/pype/hosts/resolve/lib.py index deb4fa6339..69496a5bcb 100644 --- a/pype/hosts/resolve/lib.py +++ b/pype/hosts/resolve/lib.py @@ -5,7 +5,7 @@ from pprint import pformat from pype.api import Logger -log = Logger().get_logger(__name__, "resolve") +log = Logger().get_logger(__name__) self = sys.modules[__name__] self.pm = None diff --git a/pype/hosts/resolve/pipeline.py b/pype/hosts/resolve/pipeline.py index 92bef2e13b..1a1c513f44 100644 --- a/pype/hosts/resolve/pipeline.py +++ b/pype/hosts/resolve/pipeline.py @@ -9,7 +9,7 @@ from pyblish import api as pyblish import pype from pype.api import Logger -log = Logger().get_logger(__name__, "resolve") +log = Logger().get_logger(__name__) AVALON_CONFIG = os.environ["AVALON_CONFIG"] diff --git a/pype/hosts/resolve/preload_console.py b/pype/hosts/resolve/preload_console.py index 58975777b8..de55c3673c 100644 --- a/pype/hosts/resolve/preload_console.py +++ b/pype/hosts/resolve/preload_console.py @@ -3,7 +3,7 @@ import time from pype.hosts.resolve.utils import get_resolve_module from pype.api import Logger -log = Logger().get_logger(__name__, "resolve") +log = Logger().get_logger(__name__) wait_delay = 2.5 wait = 0.00 diff --git a/pype/hosts/resolve/utils.py b/pype/hosts/resolve/utils.py index cb042a88e0..2a3f78a2df 100644 --- a/pype/hosts/resolve/utils.py +++ b/pype/hosts/resolve/utils.py @@ -9,7 +9,7 @@ import os import shutil from pype.api import Logger -log = Logger().get_logger(__name__, "resolve") +log = Logger().get_logger(__name__) def get_resolve_module(): diff --git a/pype/hosts/resolve/workio.py b/pype/hosts/resolve/workio.py index da74ebdeb1..18936df018 100644 --- a/pype/hosts/resolve/workio.py +++ b/pype/hosts/resolve/workio.py @@ -9,7 +9,7 @@ from . import ( ) -log = Logger().get_logger(__name__, "resolve") +log = Logger().get_logger(__name__) exported_projet_ext = ".drp" diff --git a/pype/lib/log.py b/pype/lib/log.py index 24e3489a3e..395385fadf 100644 --- a/pype/lib/log.py +++ b/pype/lib/log.py @@ -213,7 +213,7 @@ class PypeLogger: _process_name = None @classmethod - def get_logger(cls, name=None, host=None): + def get_logger(cls, name=None, _host=None): if not cls.initialized: cls.initialize() @@ -257,6 +257,15 @@ class PypeLogger: # Do not propagate logs to root logger logger.propagate = False + if _host is not None: + # Warn about deprecated argument + # TODO remove backwards compatibility of host argument which is + # not used for more than a year + logger.warning( + "Logger \"{}\" is using argument `host` on `get_logger`" + " which is deprecated. Please remove as backwards" + " compatibility will be removed soon." + ) return logger @classmethod diff --git a/pype/modules/clockify/launcher_actions/ClockifyStart.py b/pype/modules/clockify/launcher_actions/ClockifyStart.py index f97360662f..d02005e2de 100644 --- a/pype/modules/clockify/launcher_actions/ClockifyStart.py +++ b/pype/modules/clockify/launcher_actions/ClockifyStart.py @@ -3,7 +3,7 @@ from pype.api import Logger from pype.modules.clockify.clockify_api import ClockifyAPI -log = Logger().get_logger(__name__, "clockify_start") +log = Logger().get_logger(__name__) class ClockifyStart(api.Action): diff --git a/pype/modules/clockify/launcher_actions/ClockifySync.py b/pype/modules/clockify/launcher_actions/ClockifySync.py index 422a346023..5f0e57b8c8 100644 --- a/pype/modules/clockify/launcher_actions/ClockifySync.py +++ b/pype/modules/clockify/launcher_actions/ClockifySync.py @@ -1,7 +1,7 @@ from avalon import api, io from pype.modules.clockify.clockify_api import ClockifyAPI from pype.api import Logger -log = Logger().get_logger(__name__, "clockify_sync") +log = Logger().get_logger(__name__) class ClockifySync(api.Action): diff --git a/pype/modules/ftrack/tray/ftrack_tray.py b/pype/modules/ftrack/tray/ftrack_tray.py index 56133208c2..3f6432e541 100644 --- a/pype/modules/ftrack/tray/ftrack_tray.py +++ b/pype/modules/ftrack/tray/ftrack_tray.py @@ -13,7 +13,7 @@ from . import login_dialog from pype.api import Logger, resources -log = Logger().get_logger("FtrackModule", "ftrack") +log = Logger().get_logger("FtrackModule") class FtrackTrayWrapper: diff --git a/pype/modules/log_viewer/tray/models.py b/pype/modules/log_viewer/tray/models.py index 7112002a34..6820d5bcb9 100644 --- a/pype/modules/log_viewer/tray/models.py +++ b/pype/modules/log_viewer/tray/models.py @@ -2,8 +2,6 @@ import collections from Qt import QtCore, QtGui from pype.lib.log import PypeLogger -log = PypeLogger().get_logger("LogModel", "LoggingModule") - class LogModel(QtGui.QStandardItemModel): COLUMNS = ( @@ -45,7 +43,7 @@ class LogModel(QtGui.QStandardItemModel): # Crash if connection is not possible to skip this module if not PypeLogger.initialized: PypeLogger.initialize() - + connection = PypeLogger.get_log_mongo_connection() if connection: PypeLogger.bootstrap_mongo_log() diff --git a/pype/plugins/launcher/actions/AssetCreator.py b/pype/plugins/launcher/actions/AssetCreator.py index 9787aae002..5e845fdb5e 100644 --- a/pype/plugins/launcher/actions/AssetCreator.py +++ b/pype/plugins/launcher/actions/AssetCreator.py @@ -2,7 +2,7 @@ from avalon import api, lib from pype.api import Logger -log = Logger().get_logger(__name__, "asset_creator") +log = Logger().get_logger(__name__) class AssetCreator(api.Action): diff --git a/pype/plugins/nuke/load/actions.py b/pype/plugins/nuke/load/actions.py index 96f5f3b8c4..d0c95b6b16 100644 --- a/pype/plugins/nuke/load/actions.py +++ b/pype/plugins/nuke/load/actions.py @@ -5,7 +5,7 @@ from avalon import api from pype.api import Logger -log = Logger().get_logger(__name__, "nuke") +log = Logger().get_logger(__name__) class SetFrameRangeLoader(api.Loader):