Merge pull request #349 from scoheb/fix-logging

[JENKINS-48622] reduce logging spam from GerritMissedEventsPlaybackEnabledChecker
jenkinsci · Feb 6, 2018 · f6cdb2f · f6cdb2f
2 parents 752dcc8 + 5ce7de9
commit f6cdb2f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/...sson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsPlaybackEnabledChecker.java b/...sson/hudson/plugins/gerrit/trigger/playback/GerritMissedEventsPlaybackEnabledChecker.java
@@ -35,6 +35,7 @@
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
 
 
 /**
@@ -51,6 +52,15 @@ public class GerritMissedEventsPlaybackEnabledChecker extends AsyncPeriodicWork
             LoggerFactory.getLogger(GerritMissedEventsPlaybackEnabledChecker.class);
 
 
+    /**
+     * No spam in log file.
+     * @return FINEST level for logging.
+     */
+    @Override
+    protected Level getNormalLoggingLevel() {
+        return Level.FINEST;
+    }
+
     /**
      * Default constructor.
      */

diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/utils/GerritPluginChecker.java
@@ -61,7 +61,7 @@ private static String buildURL(IGerritHudsonTriggerConfig config) {
         }
 
         if (!config.isUseRestApi()) {
-            logger.warn("REST API is not enabled.");
+            logger.debug("REST API is not enabled.");
             return null;
         }
 
@@ -150,7 +150,11 @@ public static boolean isPluginEnabled(IGerritHudsonTriggerConfig config, String
 
         String restUrl = buildURL(config);
         if (restUrl == null) {
-            logger.warn(Messages.PluginInstalledRESTApiNull(pluginName));
+            if (quiet) {
+                logger.debug(Messages.PluginInstalledRESTApiNull(pluginName));
+            } else {
+                logger.warn(Messages.PluginInstalledRESTApiNull(pluginName));
+            }
             return false;
         }
         logger.trace("{}plugins/{}/", restUrl, pluginName);