From 2a39a8410178f3793b36878369dbf296ec63821d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 15 May 2018 11:09:01 -0400 Subject: [PATCH 1/2] =?UTF-8?q?If=20we=20are=20moments=20away=20from=20exi?= =?UTF-8?q?ting=20the=20quiet=20period,=20we=20might=20as=20well=20claim?= =?UTF-8?q?=20we=20are=20in=20it,=20because=20otherwise=20we=20just=20say?= =?UTF-8?q?=20=C2=AF\=5F(=E3=83=84)=5F/=C2=AF=20which=20is=20less=20helpfu?= =?UTF-8?q?l.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/java/hudson/model/Queue.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 0938ac9cb0..e065bd4f0c 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2487,7 +2487,7 @@ public class Queue extends ResourceController implements Saveable { public CauseOfBlockage getCauseOfBlockage() { long diff = timestamp.getTimeInMillis() - System.currentTimeMillis(); - if (diff > 0) + if (diff >= 0) return CauseOfBlockage.fromMessage(Messages._Queue_InQuietPeriod(Util.getTimeSpanString(diff))); else return CauseOfBlockage.fromMessage(Messages._Queue_Unknown()); From 9a0c86e06345e5e5972879e75880bc22e1fc135e Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Wed, 23 Jan 2019 12:30:21 -0500 Subject: [PATCH 2/2] When we are about to finish waiting, report that instead of unknown --- core/src/main/java/hudson/model/Queue.java | 2 +- core/src/main/resources/hudson/model/Messages.properties | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index e065bd4f0c..b2c4f7135a 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -2490,7 +2490,7 @@ public class Queue extends ResourceController implements Saveable { if (diff >= 0) return CauseOfBlockage.fromMessage(Messages._Queue_InQuietPeriod(Util.getTimeSpanString(diff))); else - return CauseOfBlockage.fromMessage(Messages._Queue_Unknown()); + return CauseOfBlockage.fromMessage(Messages._Queue_FinishedWaiting()); } @Override diff --git a/core/src/main/resources/hudson/model/Messages.properties b/core/src/main/resources/hudson/model/Messages.properties index 191592641f..e136e683d1 100644 --- a/core/src/main/resources/hudson/model/Messages.properties +++ b/core/src/main/resources/hudson/model/Messages.properties @@ -200,6 +200,7 @@ Queue.InProgress=A build is already in progress Queue.InQuietPeriod=In the quiet period. Expires in {0} Queue.NodeOffline=\u2018{0}\u2019 is offline Queue.Unknown=??? +Queue.FinishedWaiting=Finished waiting Queue.WaitingForNextAvailableExecutor=Waiting for next available executor Queue.WaitingForNextAvailableExecutorOn=Waiting for next available executor on \u2018{0}\u2019 Queue.init=Restoring the build queue