Merge branch 'CURA-7245_sentry_prune_more_user_data' of github.com:Ultimaker/Cura into 4.5

This commit is contained in:
Jaime van Kessel 2020-02-24 17:01:29 +01:00
commit 77f0ff588f
No known key found for this signature in database
GPG key ID: 3710727397403C91
3 changed files with 25 additions and 11 deletions

View file

@ -3,6 +3,9 @@
from UM.Logger import LogOutput
from typing import Set
from cura.CrashHandler import CrashHandler
try:
from sentry_sdk import add_breadcrumb
except ImportError:
@ -10,8 +13,6 @@ except ImportError:
from typing import Optional
import os
home_dir = os.path.expanduser("~")
class SentryLogger(LogOutput):
# Sentry (https://sentry.io) is the service that Cura uses for logging crashes. This logger ensures that the
@ -37,7 +38,7 @@ class SentryLogger(LogOutput):
# \param message String containing message to be logged
def log(self, log_type: str, message: str) -> None:
level = self._translateLogType(log_type)
message = self._pruneSensitiveData(message)
message = CrashHandler.pruneSensitiveData(message)
if level is None:
if message not in self._show_once:
level = self._translateLogType(log_type[0])
@ -47,12 +48,6 @@ class SentryLogger(LogOutput):
else:
add_breadcrumb(level = level, message = message)
@staticmethod
def _pruneSensitiveData(message):
if home_dir in message:
message = message.replace(home_dir, "<user_home>")
return message
@staticmethod
def _translateLogType(log_type: str) -> Optional[str]:
return SentryLogger._levels.get(log_type)