Merge pull request #196 from dshearer/maint-1.3-issue-192

Maint 1.3 issue 192

jobberrunner/queue.go

@@ -3,9 +3,10 @@ package main
 import (
 	"container/heap"
 	"context"
+	"time"
+
 	"github.com/dshearer/jobber/common"
 	"github.com/dshearer/jobber/jobfile"
-	"time"
 )
 
 func nextRunTime(job *jobfile.Job, now time.Time) *time.Time {
@@ -103,7 +104,7 @@ func (jq *JobQueue) Pop(ctx context.Context, now time.Time) *jobfile.Job {
 		job := heap.Pop(&jq.q).(*jobfile.Job)
 
 		// sleep till it's time to run it
-		if now.Before(*job.NextRunTime) {
+		for now.Before(*job.NextRunTime) {
 			afterChan := time.After(job.NextRunTime.Sub(now))
 			select {
 			case now = <-afterChan:

packaging/debian_9/debian-pkg/changelog

@@ -1,15 +1,21 @@
-jobber (1.3.2-1) UNRELEASED; urgency=low
+jobber (1.3.3-pr.1-1) UNRELEASED; urgency=low
 
-  * Release 1.3.2
+  * Release 1.3.3-pr.1
+
+ -- C. Dylan Shearer <[email protected]>  Sat, 28 May 2018 10:22:00 -0800
+
+ jobber (1.3.2-1) UNRELEASED; urgency=low
+
+   * Release 1.3.2
+
+  -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
 
- -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
-
 jobber (1.3.1-1) UNRELEASED; urgency=low
 
   * Release 1.3.1
 
  -- C. Dylan Shearer <[email protected]>  Sun, 3 Feb 2018 15:48:00 -0800
- 
+
 jobber (1.3.0-1) UNRELEASED; urgency=low
 
   * Release 1.3.0
@@ -21,13 +27,13 @@ jobber (1.3.0-pr.1-1) UNRELEASED; urgency=low
   * Release 1.3.0-pr.1
 
  -- C. Dylan Shearer <[email protected]>  Sat, 13 Jan 2018 10:47:00 -0800
- 
+
 jobber (1.2.1-1) UNRELEASED; urgency=low
 
   * Release 1.2.1
 
  -- C. Dylan Shearer <[email protected]>  Fri, 28 Dec 2017 18:50:00 -0800
- 
+
 jobber (1.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)

packaging/ubuntu_14/debian-pkg/changelog

@@ -1,15 +1,21 @@
-jobber (1.3.2-1) UNRELEASED; urgency=low
+jobber (1.3.3-pr.1-1) UNRELEASED; urgency=low
 
-  * Release 1.3.2
+  * Release 1.3.3-pr.1
+
+ -- C. Dylan Shearer <[email protected]>  Sat, 28 May 2018 10:22:00 -0800
+
+ jobber (1.3.2-1) UNRELEASED; urgency=low
+
+   * Release 1.3.2
+
+  -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
 
- -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
-
 jobber (1.3.1-1) UNRELEASED; urgency=low
 
   * Release 1.3.1
 
  -- C. Dylan Shearer <[email protected]>  Sun, 3 Feb 2018 15:48:00 -0800
- 
+
 jobber (1.3.0-1) UNRELEASED; urgency=low
 
   * Release 1.3.0
@@ -21,13 +27,13 @@ jobber (1.3.0-pr.1-1) UNRELEASED; urgency=low
   * Release 1.3.0-pr.1
 
  -- C. Dylan Shearer <[email protected]>  Sat, 13 Jan 2018 10:47:00 -0800
- 
+
 jobber (1.2.1-1) UNRELEASED; urgency=low
 
   * Release 1.2.1
 
  -- C. Dylan Shearer <[email protected]>  Fri, 28 Dec 2017 18:50:00 -0800
- 
+
 jobber (1.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)

packaging/ubuntu_16/debian-pkg/changelog

@@ -1,15 +1,21 @@
-jobber (1.3.2-1) UNRELEASED; urgency=low
+jobber (1.3.3-pr.1-1) UNRELEASED; urgency=low
 
-  * Release 1.3.2
+  * Release 1.3.3-pr.1
+
+ -- C. Dylan Shearer <[email protected]>  Sat, 28 May 2018 10:22:00 -0800
+
+ jobber (1.3.2-1) UNRELEASED; urgency=low
+
+   * Release 1.3.2
+
+  -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
 
- -- C. Dylan Shearer <[email protected]>  Sat, 24 Feb 2018 12:40:00 -0800
-
 jobber (1.3.1-1) UNRELEASED; urgency=low
 
   * Release 1.3.1
 
  -- C. Dylan Shearer <[email protected]>  Sun, 3 Feb 2018 15:48:00 -0800
- 
+
 jobber (1.3.0-1) UNRELEASED; urgency=low
 
   * Release 1.3.0
@@ -21,13 +27,13 @@ jobber (1.3.0-pr.1-1) UNRELEASED; urgency=low
   * Release 1.3.0-pr.1
 
  -- C. Dylan Shearer <[email protected]>  Sat, 13 Jan 2018 10:47:00 -0800
- 
+
 jobber (1.2.1-1) UNRELEASED; urgency=low
 
   * Release 1.2.1
 
  -- C. Dylan Shearer <[email protected]>  Fri, 28 Dec 2017 18:50:00 -0800
- 
+
 jobber (1.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #nnnn)

version

@@ -1 +1 @@
-1.3.2
+1.3.3-pr.1