mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-15 04:52:20 +00:00
Merge pull request #3445 from jsoref/quiet_period_edge_case
Address quiet period edge case (???)
This commit is contained in:
2 files changed
+3
-2
No files matched your search
@@ -2487,10 +2487,10 @@ 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());
|
||||
return CauseOfBlockage.fromMessage(Messages._Queue_FinishedWaiting());
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in new issue
Block a user