init

Author: linx

.gitignore

@@ -0,0 +1 @@
+.idea

cron.go

@@ -1,6 +1,7 @@
 package gron
 
 import (
+	"fmt"
 	"sort"
 	"time"
 )
@@ -17,6 +18,12 @@ type Entry struct {
 	// the last time the job was run. This is zero time if the job has not been
 	// run.
 	Prev time.Time
+
+	// job begin time, default is time.Now()
+	Begin time.Time
+
+	// job name
+	Name string
 }
 
 // byTime is a handy wrapper to chronologically sort entries.
@@ -57,13 +64,15 @@ type Cron struct {
 	running bool
 	add     chan *Entry
 	stop    chan struct{}
+	debug   bool
 }
 
 // New instantiates new Cron instant c.
-func New() *Cron {
+func New(debug bool) *Cron {
 	return &Cron{
-		stop: make(chan struct{}),
-		add:  make(chan *Entry),
+		stop:  make(chan struct{}),
+		add:   make(chan *Entry),
+		debug: debug,
 	}
 }
 
@@ -77,11 +86,20 @@ func (c *Cron) Start() {
 //
 // if cron instant is not running, adding to entries is trivial.
 // otherwise, to prevent data-race, adds through channel.
-func (c *Cron) Add(s Schedule, j Job) {
+func (c *Cron) Add(n string, s Schedule, j Job, begin ...time.Time) {
 
+	var b = time.Now().Local()
+	if len(begin) >= 1 {
+		b = begin[0]
+	}
 	entry := &Entry{
 		Schedule: s,
 		Job:      j,
+		Begin:    b,
+		Name:     n,
+	}
+	if c.debug {
+		fmt.Println("add job:", n, " begin:", b.Format(time.RFC3339))
 	}
 
 	if !c.running {
@@ -92,8 +110,8 @@ func (c *Cron) Add(s Schedule, j Job) {
 }
 
 // AddFunc registers the Job function for the given Schedule.
-func (c *Cron) AddFunc(s Schedule, j func()) {
-	c.Add(s, JobFunc(j))
+func (c *Cron) AddFunc(n string, s Schedule, j func(), begin ...time.Time) {
+	c.Add(n, s, JobFunc(j), begin...)
 }
 
 // Stop halts cron instant c from running.
@@ -119,7 +137,7 @@ func (c *Cron) run() {
 
 	// to figure next trig time for entries, referenced from now
 	for _, e := range c.entries {
-		e.Next = e.Schedule.Next(now)
+		e.Next = e.Schedule.Next(e.Begin) //first time start from e.Begin
 	}
 
 	for {
@@ -139,10 +157,13 @@ func (c *Cron) run() {
 				}
 				entry.Prev = now
 				entry.Next = entry.Schedule.Next(now)
+				if c.debug {
+					fmt.Println(now.Format(time.RFC3339), " run job:", entry.Name, " next:", entry.Next.Format(time.RFC3339))
+				}
 				go entry.Job.Run()
 			}
 		case e := <-c.add:
-			e.Next = e.Schedule.Next(time.Now())
+			e.Next = e.Schedule.Next(e.Begin)
 			c.entries = append(c.entries, e)
 		case <-c.stop:
 			return // terminate go-routine.

cron_test.go

@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/roylee0704/gron/xtime"
+	"github.com/linxlib/gron/xtime"
 )
 
 // Most test jobs scheduled to run at 1 second mark.
@@ -67,6 +67,23 @@ func TestAddBeforeRun(t *testing.T) {
 	}
 }
 
+func TestEntryNextRunTimeWithBeginTime(t *testing.T) {
+	done := make(chan time.Time)
+	cron := New()
+	cron.AddFunc(Every(10*time.Second), func() { done <- time.Now() }, time.Now().Add(-time.Second*5))
+	cron.Start()
+	defer cron.Stop()
+	fmt.Println("start:", time.Now())
+
+	select {
+	case <-time.After(10 * OneSecond):
+		t.FailNow()
+	case y := <-done:
+		fmt.Println("end:", y)
+	}
+
+}
+
 // start a cron, add a job, expect it runs
 func TestAddWhileRun(t *testing.T) {
 	done := make(chan struct{})

go.mod

@@ -0,0 +1,3 @@
+module github.com/linxlib/gron
+
+go 1.13

schedule.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/roylee0704/gron/xtime"
+	"github.com/linxlib/gron/xtime"
 )
 
 // Schedule is the interface that wraps the basic Next method.

schedule_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/roylee0704/gron/xtime"
+	"github.com/linxlib/gron/xtime"
 )
 
 func TestPeriodicAtNext(t *testing.T) {

xtime/xtime.go

@@ -16,3 +16,10 @@ const (
 	//Week has 7 days
 	Week time.Duration = Day * 7
 )
+
+var (
+	BeginOfMonth     = time.Now().AddDate(0, 0, -time.Now().Day()+1)
+	BeginOfMonthZero = time.Date(BeginOfMonth.Year(), BeginOfMonth.Month(), BeginOfMonth.Day(), 0, 0, 0, 0, BeginOfMonth.Location())
+	EndOfMonth       = BeginOfMonth.AddDate(0, 1, -1)
+	EndOfMonthZero   = time.Date(EndOfMonth.Year(), EndOfMonth.Month(), EndOfMonth.Day(), 0, 0, 0, 0, EndOfMonth.Location())
+)