From ce1df7d3ce732e12e675461debac8a5b2be30dee Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Fri, 28 Mar 2014 11:34:10 -0400 Subject: [PATCH] Improved logging. --- core/src/main/java/hudson/triggers/Trigger.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/triggers/Trigger.java b/core/src/main/java/hudson/triggers/Trigger.java index e75f70eec1..2cef1d9189 100644 --- a/core/src/main/java/hudson/triggers/Trigger.java +++ b/core/src/main/java/hudson/triggers/Trigger.java @@ -200,7 +200,7 @@ public abstract class Trigger implements Describable> public void doRun() { while(new Date().getTime()-cal.getTimeInMillis()>1000) { - LOGGER.fine("cron checking "+cal.getTime().toLocaleString()); + LOGGER.log(Level.FINE, "cron checking {0}", cal.getTime()); try { checkTriggers(cal); @@ -250,17 +250,19 @@ public abstract class Trigger implements Describable> for (ParameterizedJobMixIn.ParameterizedJob p : inst.getAllItems(ParameterizedJobMixIn.ParameterizedJob.class)) { for (Trigger t : p.getTriggers().values()) { if (! (t instanceof SCMTrigger && scmd.synchronousPolling)) { - LOGGER.fine("cron checking "+p.getName()); + LOGGER.log(Level.FINE, "cron checking {0} with spec ‘{1}’", new Object[] {p, t.spec.trim()}); if (t.tabs.check(cal)) { - LOGGER.config("cron triggered "+p.getName()); + LOGGER.log(Level.CONFIG, "cron triggered {0}", p); try { t.run(); } catch (Throwable e) { // t.run() is a plugin, and some of them throw RuntimeException and other things. // don't let that cancel the polling activity. report and move on. - LOGGER.log(Level.WARNING, t.getClass().getName()+".run() failed for "+p.getName(),e); + LOGGER.log(Level.WARNING, t.getClass().getName() + ".run() failed for " + p, e); } + } else { + LOGGER.log(Level.FINER, "did not trigger {0}", p); } } }