summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Bugzilla/Search/Quicksearch.pm1
-rw-r--r--Bugzilla/Sentry.pm17
2 files changed, 16 insertions, 2 deletions
diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 6ea28169c..563e2c383 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -294,6 +294,7 @@ sub _parse_line {
$line =~ tr/\001/'/;
my @words = parse_line($delim, $keep, $line);
+
foreach my $word (@words) {
$word =~ tr/\000/'/;
}
diff --git a/Bugzilla/Sentry.pm b/Bugzilla/Sentry.pm
index ac053d992..d2994e78b 100644
--- a/Bugzilla/Sentry.pm
+++ b/Bugzilla/Sentry.pm
@@ -46,8 +46,16 @@ use constant CONFIG => {
token_generation_error
)],
- # any error messages matching these regex's will not be sent to sentry
+ # any error/warning messages matching these regex's will not be logged or
+ # sent to sentry
ignore => [
+ qr/^compiled template :\s*$/,
+ qr/^Use of uninitialized value \$compiled in concatenation \(\.\) or string/,
+ ],
+
+ # any error/warning messages matching these regex's will be logged but not
+ # sent to sentry
+ sentry_ignore => [
qr/Software caused connection abort/,
qr/Could not check out .*\/cvsroot/,
qr/Unicode character \S+ is illegal/,
@@ -124,6 +132,11 @@ sub sentry_handle_error {
}
my $message = join(" ", map { trim($_) } grep { $_ ne '' } @message);
+ # message content filtering
+ foreach my $re (@{ CONFIG->{ignore} }) {
+ return 0 if $message =~ $re;
+ }
+
# determine logger
my $logger;
foreach my $config (@{ CONFIG->{logger} }) {
@@ -154,7 +167,7 @@ sub sentry_handle_error {
# message content filtering
if ($send_to_sentry) {
- foreach my $re (@{ CONFIG->{ignore} }) {
+ foreach my $re (@{ CONFIG->{sentry_ignore} }) {
if ($message =~ $re) {
$send_to_sentry = 0;
last;