commit 98ceb5cd52eeda1f30d81c19b20638a60760f512
author David Pursehouse <dpursehouse@collab.net> Thu Jul 18 10:43:35 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 18 10:43:35 2019 +0000
tree 5ddc443bc3a04a770246b9b2c643f74f3484b45a
parent 9049f4a285b06a51d444398ed1abdea9a3c20b1c
parent 2ee55bdd29e36fd1ea3de7a3bded2bbd60c4f3fc

Merge "ProjectWatch: For invalid filters log only on info level and without stacktrace"

java/com/google/gerrit/server/mail/send/ProjectWatch.java

diff --git a/java/com/google/gerrit/server/mail/send/ProjectWatch.java b/java/com/google/gerrit/server/mail/send/ProjectWatch.java
index 06a2e0d..eb3b831 100644
--- a/java/com/google/gerrit/server/mail/send/ProjectWatch.java
+++ b/java/com/google/gerrit/server/mail/send/ProjectWatch.java
@@ -99,9 +99,9 @@
           try {
             add(matching, state.getNameKey(), nc);
           } catch (QueryParseException e) {
-            logger.atWarning().withCause(e).log(
-                "Project %s has invalid notify %s filter \"%s\"",
-                state.getName(), nc.getName(), nc.getFilter());
+            logger.atInfo().log(
+                "Project %s has invalid notify %s filter \"%s\": %s",
+                state.getName(), nc.getName(), nc.getFilter(), e.getMessage());
           }
         }
       }
@@ -232,8 +232,8 @@
       logger.atFine().log("The filter did not match for account %s; skip notification", accountId);
     } catch (QueryParseException e) {
       // Ignore broken filter expressions.
-      logger.atWarning().withCause(e).log(
-          "Account %s has invalid filter in project watch %s", accountId, key);
+      logger.atInfo().log(
+          "Account %s has invalid filter in project watch %s: %s", accountId, key, e.getMessage());
     }
     return false;
   }