From 8aa763e24944552967f6fca1d71c8e085b809914 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20W=C3=BCrthner?= <5859228+crysxd@users.noreply.github.com> Date: Tue, 28 Nov 2023 12:29:49 +0100 Subject: [PATCH] Update for new logging --- octoapp/sentry.py | 8 ++++---- octoprint_octoapp/__init__.py | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/octoapp/sentry.py b/octoapp/sentry.py index 7c4f22a..eb996bc 100644 --- a/octoapp/sentry.py +++ b/octoapp/sentry.py @@ -91,22 +91,22 @@ def _beforeSendFilter(event, hint): @staticmethod def Info(tag, msg): - paddedTag = "{:<15}".format(" " + tag).upper() + paddedTag = "{:<15}".format(tag).upper() Sentry.Logger.info(paddedTag + " | " + msg) @staticmethod def Debug(tag, msg): - paddedTag = "{:<14}".format(tag).upper() + paddedTag = "{:<15}".format(tag).upper() Sentry.Logger.debug(paddedTag + " | " + msg) @staticmethod def Warn(tag, msg): - paddedTag = "{:<15}".format(" " + tag).upper() + paddedTag = "{:<15}".format(tag).upper() Sentry.Logger.warning(paddedTag + " | " + msg) @staticmethod def Error(tag, msg): - paddedTag = "{:<14}".format(tag).upper() + paddedTag = "{:<15}".format(tag).upper() Sentry.Logger.error(paddedTag + " | " + msg) diff --git a/octoprint_octoapp/__init__.py b/octoprint_octoapp/__init__.py index ae72b1d..19157bd 100644 --- a/octoprint_octoapp/__init__.py +++ b/octoprint_octoapp/__init__.py @@ -65,7 +65,7 @@ def on_startup(self, host, port): Sentry.Info("PLUGIN", "OctoApp starting %s" % self._plugin_version) # Init the static snapshot helper - WebcamHelper.Init(self._logger, OctoPrintWebcamHelper(self._settings)) + WebcamHelper.Init(OctoPrintWebcamHelper(self._settings)) # Setup our printer state object, that implements the interface. printerStateObject = PrinterStateObject(self._printer) @@ -274,9 +274,7 @@ def _initLogger(self): self._logger_handler.setLevel(logging.DEBUG) self._logger.addHandler(self._logger_handler) self._logger.setLevel(logging.DEBUG) - self._logger.propagate = True - - + self._logger.propagate = False __plugin_name__ = "OctoApp"