From c8051af3b9da5bbaf96e39aec91b90c905f75574 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Fri, 14 Jun 2019 11:27:42 -0400 Subject: [PATCH] updating github.com/robfig/cron to v1.1.0 --- go.mod | 4 +- go.sum | 4 +- vendor/github.com/robfig/cron/README.md | 4 ++ vendor/github.com/robfig/cron/cron.go | 68 ++++++++++++++----------- vendor/github.com/robfig/cron/doc.go | 10 ++-- vendor/modules.txt | 2 +- 6 files changed, 51 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 3a754c1df3d..66f597ee39c 100644 --- a/go.mod +++ b/go.mod @@ -126,7 +126,7 @@ require ( github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 github.com/quobyte/api v0.1.2 - github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 + github.com/robfig/cron v1.1.0 github.com/russross/blackfriday v1.5.2 github.com/seccomp/libseccomp-golang v0.0.0-20150813023252-1b506fc7c24e // indirect github.com/shurcooL/sanitized_anchor_name v0.0.0-20151028001915-10ef21a441db // indirect @@ -380,7 +380,7 @@ replace ( github.com/prometheus/procfs => github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a github.com/quobyte/api => github.com/quobyte/api v0.1.2 github.com/remyoudompheng/bigfft => github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446 - github.com/robfig/cron => github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 + github.com/robfig/cron => github.com/robfig/cron v1.1.0 github.com/rubiojr/go-vhd => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c github.com/russross/blackfriday => github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5 github.com/satori/go.uuid => github.com/satori/go.uuid v1.2.0 diff --git a/go.sum b/go.sum index a2b4ce35463..d2a0c297477 100644 --- a/go.sum +++ b/go.sum @@ -350,8 +350,8 @@ github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R github.com/quobyte/api v0.1.2 h1:lPHLsuvtjFyk8WhC4uHoHRkScijIHcffTWBBP+YpzYo= github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI= github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M= -github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 h1:b904/jbnmYuSPd5ojGzVTLjKPVTSj3t/e1vEPiPGjEg= -github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= +github.com/robfig/cron v1.1.0 h1:jk4/Hud3TTdcrJgUOBgsqrZBarcxl6ADIjSC2iniwLY= +github.com/robfig/cron v1.1.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c h1:ht7N4d/B7Ezf58nvMNVF3OlvDlz9pp+WHVcRNS0nink= github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto= github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5 h1:+6eORf9Bt4C3Wjt91epyu6wvLW+P6+AEODb6uKgO+4g= diff --git a/vendor/github.com/robfig/cron/README.md b/vendor/github.com/robfig/cron/README.md index 157ed082d46..ec40c95fcb9 100644 --- a/vendor/github.com/robfig/cron/README.md +++ b/vendor/github.com/robfig/cron/README.md @@ -1,2 +1,6 @@ [![GoDoc](http://godoc.org/github.com/robfig/cron?status.png)](http://godoc.org/github.com/robfig/cron) [![Build Status](https://travis-ci.org/robfig/cron.svg?branch=master)](https://travis-ci.org/robfig/cron) + +# cron + +Documentation here: https://godoc.org/github.com/robfig/cron diff --git a/vendor/github.com/robfig/cron/cron.go b/vendor/github.com/robfig/cron/cron.go index efd534707ec..2318aeb2e7d 100644 --- a/vendor/github.com/robfig/cron/cron.go +++ b/vendor/github.com/robfig/cron/cron.go @@ -165,11 +165,11 @@ func (c *Cron) runWithRecovery(j Job) { j.Run() } -// Run the scheduler.. this is private just due to the need to synchronize +// Run the scheduler. this is private just due to the need to synchronize // access to the 'running' state variable. func (c *Cron) run() { // Figure out the next activation times for each entry. - now := time.Now().In(c.location) + now := c.now() for _, entry := range c.entries { entry.Next = entry.Schedule.Next(now) } @@ -178,45 +178,46 @@ func (c *Cron) run() { // Determine the next entry to run. sort.Sort(byTime(c.entries)) - var effective time.Time + var timer *time.Timer if len(c.entries) == 0 || c.entries[0].Next.IsZero() { // If there are no entries yet, just sleep - it still handles new entries // and stop requests. - effective = now.AddDate(10, 0, 0) + timer = time.NewTimer(100000 * time.Hour) } else { - effective = c.entries[0].Next + timer = time.NewTimer(c.entries[0].Next.Sub(now)) } - timer := time.NewTimer(effective.Sub(now)) - select { - case now = <-timer.C: - now = now.In(c.location) - // Run every entry whose next time was this effective time. - for _, e := range c.entries { - if e.Next != effective { - break + for { + select { + case now = <-timer.C: + now = now.In(c.location) + // Run every entry whose next time was less than now + for _, e := range c.entries { + if e.Next.After(now) || e.Next.IsZero() { + break + } + go c.runWithRecovery(e.Job) + e.Prev = e.Next + e.Next = e.Schedule.Next(now) } - go c.runWithRecovery(e.Job) - e.Prev = e.Next - e.Next = e.Schedule.Next(now) + + case newEntry := <-c.add: + timer.Stop() + now = c.now() + newEntry.Next = newEntry.Schedule.Next(now) + c.entries = append(c.entries, newEntry) + + case <-c.snapshot: + c.snapshot <- c.entrySnapshot() + continue + + case <-c.stop: + timer.Stop() + return } - continue - case newEntry := <-c.add: - c.entries = append(c.entries, newEntry) - newEntry.Next = newEntry.Schedule.Next(time.Now().In(c.location)) - - case <-c.snapshot: - c.snapshot <- c.entrySnapshot() - - case <-c.stop: - timer.Stop() - return + break } - - // 'now' should be updated after newEntry and snapshot cases. - now = time.Now().In(c.location) - timer.Stop() } } @@ -251,3 +252,8 @@ func (c *Cron) entrySnapshot() []*Entry { } return entries } + +// now returns current time in c location +func (c *Cron) now() time.Time { + return time.Now().In(c.location) +} diff --git a/vendor/github.com/robfig/cron/doc.go b/vendor/github.com/robfig/cron/doc.go index dbdf50127a5..d02ec2f3b56 100644 --- a/vendor/github.com/robfig/cron/doc.go +++ b/vendor/github.com/robfig/cron/doc.go @@ -78,22 +78,22 @@ You may use one of several pre-defined schedules in place of a cron expression. ----- | ----------- | ------------- @yearly (or @annually) | Run once a year, midnight, Jan. 1st | 0 0 0 1 1 * @monthly | Run once a month, midnight, first of month | 0 0 0 1 * * - @weekly | Run once a week, midnight on Sunday | 0 0 0 * * 0 + @weekly | Run once a week, midnight between Sat/Sun | 0 0 0 * * 0 @daily (or @midnight) | Run once a day, midnight | 0 0 0 * * * @hourly | Run once an hour, beginning of hour | 0 0 * * * * Intervals -You may also schedule a job to execute at fixed intervals. This is supported by -formatting the cron spec like this: +You may also schedule a job to execute at fixed intervals, starting at the time it's added +or cron is run. This is supported by formatting the cron spec like this: @every where "duration" is a string accepted by time.ParseDuration (http://golang.org/pkg/time/#ParseDuration). -For example, "@every 1h30m10s" would indicate a schedule that activates every -1 hour, 30 minutes, 10 seconds. +For example, "@every 1h30m10s" would indicate a schedule that activates after +1 hour, 30 minutes, 10 seconds, and then every interval after that. Note: The interval does not take the job runtime into account. For example, if a job takes 3 minutes to run, and it is scheduled to run every 5 minutes, diff --git a/vendor/modules.txt b/vendor/modules.txt index 021626e611d..3478ca97c1a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -722,7 +722,7 @@ github.com/prometheus/procfs/nfs github.com/prometheus/procfs/xfs # github.com/quobyte/api v0.1.2 => github.com/quobyte/api v0.1.2 github.com/quobyte/api -# github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 => github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8 +# github.com/robfig/cron v1.1.0 => github.com/robfig/cron v1.1.0 github.com/robfig/cron # github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c => github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c github.com/rubiojr/go-vhd/vhd