[JENKINS-21119] Extend loggning to show assigned priority

* Added missing log when global default priority is used * Make sure to log with finer() id log-level is ALL
jenkinsci · Jan 2, 2014 · 035da32 · 035da32
1 parent 8d41a04
commit 035da32
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/jenkins/advancedqueue/ItemTransitionLogger.java b/src/main/java/jenkins/advancedqueue/ItemTransitionLogger.java
@@ -37,7 +37,8 @@ public class ItemTransitionLogger {
 	private final static Logger LOGGER = Logger.getLogger("PrioritySorter.Queue.Items");
 
 	static public void logNewItem(ItemInfo info) {
-		if (LOGGER.getLevel().intValue() >= Level.FINER.intValue()) {
+		if (LOGGER.getLevel().intValue() == Level.ALL.intValue()
+				|| LOGGER.getLevel().intValue() >= Level.FINER.intValue()) {
 			LOGGER.finer("New Item: " + info.toString() + "\n" + info.getDescisionLog());
 		} else {
 			LOGGER.fine("New Item: " + info.toString());

diff --git a/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java b/src/main/java/jenkins/advancedqueue/PriorityConfiguration.java
@@ -229,6 +229,7 @@ public PriorityConfigurationCallback getPriority(Queue.Item item, PriorityConfig
 			return getPriorityForJobGroup(priorityCallback, jobGroup, item);
 		}
 		//
+		priorityCallback.addDecisionLog("Assigning global default priority");
 		return priorityCallback.setPrioritySelection(PrioritySorterConfiguration.get().getStrategy()
 				.getDefaultPriority());
 	}