Merge branch 'v2' of https://github.com/crysxd/OctoApp-Plugin into v2

crysxd · Nov 28, 2023 · 9a5a50c · 9a5a50c
2 parents cbc5de7 + 8aa763e
commit 9a5a50c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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"