From 80897822d3351ec4b5d57ca72d7b074aad5d268b Mon Sep 17 00:00:00 2001 From: owner Date: Fri, 23 Aug 2019 21:05:48 -0500 Subject: [PATCH] Updates logging to be more consistent The way the logging was initialized varied from file to file. This just updates the init to be the same everywhere. Also updates some LOG.warn to be LOG.info. --- context.py | 2 +- context_play.py | 2 +- resources/lib/entrypoint/__init__.py | 2 +- resources/lib/entrypoint/service.py | 14 +++++++------- service.py | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/context.py b/context.py index dbcc7aff..42faafbb 100644 --- a/context.py +++ b/context.py @@ -24,7 +24,7 @@ from entrypoint import Context ################################################################################################# -LOG = logging.getLogger("JELLYFIN.context") +LOG = logging.getLogger("JELLYFIN." + __name__) ################################################################################################# diff --git a/context_play.py b/context_play.py index d4a4ebfb..8e112949 100644 --- a/context_play.py +++ b/context_play.py @@ -24,7 +24,7 @@ from entrypoint import Context ################################################################################################# -LOG = logging.getLogger("JELLYFIN.context") +LOG = logging.getLogger("JELLYFIN." + __name__) ################################################################################################# diff --git a/resources/lib/entrypoint/__init__.py b/resources/lib/entrypoint/__init__.py index 1c7899e6..2a4ad32d 100644 --- a/resources/lib/entrypoint/__init__.py +++ b/resources/lib/entrypoint/__init__.py @@ -15,7 +15,7 @@ from jellyfin import Jellyfin Jellyfin.set_loghandler(loghandler.LogHandler, logging.DEBUG) loghandler.reset() loghandler.config() -LOG = logging.getLogger('JELLYFIN.entrypoint') +LOG = logging.getLogger('JELLYFIN.' + __name__) ################################################################################################# diff --git a/resources/lib/entrypoint/service.py b/resources/lib/entrypoint/service.py index d2aa5dd1..a267633b 100644 --- a/resources/lib/entrypoint/service.py +++ b/resources/lib/entrypoint/service.py @@ -60,13 +60,13 @@ class Service(xbmc.Monitor): if self.settings['enable_context_transcode']: window('jellyfin_context_transcode.bool', True) - LOG.warn("--->>>[ %s ]", client.get_addon_name()) - LOG.warn("Version: %s", client.get_version()) - LOG.warn("KODI Version: %s", xbmc.getInfoLabel('System.BuildVersion')) - LOG.warn("Platform: %s", settings('platformDetected')) - LOG.warn("Python Version: %s", sys.version) - LOG.warn("Using dynamic paths: %s", settings('useDirectPaths') == "0") - LOG.warn("Log Level: %s", self.settings['log_level']) + LOG.info("--->>>[ %s ]", client.get_addon_name()) + LOG.info("Version: %s", client.get_version()) + LOG.info("KODI Version: %s", xbmc.getInfoLabel('System.BuildVersion')) + LOG.info("Platform: %s", settings('platformDetected')) + LOG.info("Python Version: %s", sys.version) + LOG.info("Using dynamic paths: %s", settings('useDirectPaths') == "0") + LOG.info("Log Level: %s", self.settings['log_level']) self.check_version() verify_kodi_defaults() diff --git a/service.py b/service.py index 697807ae..ac26a5e3 100644 --- a/service.py +++ b/service.py @@ -26,7 +26,7 @@ from helper import settings ################################################################################################# -LOG = logging.getLogger("JELLYFIN.service") +LOG = logging.getLogger("JELLYFIN." + __name__) DELAY = int(settings('startupDelay') if settings('SyncInstallRunDone.bool') else 4 or 0) ################################################################################################# @@ -68,8 +68,8 @@ class ServiceManager(threading.Thread): if __name__ == "__main__": - LOG.warn("-->[ service ]") - LOG.warn("Delay startup by %s seconds.", DELAY) + LOG.info("-->[ service ]") + LOG.info("Delay startup by %s seconds.", DELAY) while True: @@ -93,4 +93,4 @@ if __name__ == "__main__": break - LOG.warn("--<[ service ]") + LOG.info("--<[ service ]")