Merge pull request aptible#59 from pikapika2020/go-1-14-migration

Migration to `go 1.14` with go modules and latest versions of external dependicies

Author: krallin

.travis.yml

@@ -3,14 +3,7 @@ dist: trusty
 
 language: go
 
-go: "1.9"
-
-before_install:
-  - mkdir -p $HOME/gopath/src/github.com/aptible/supercronic
-  - rsync -az ${TRAVIS_BUILD_DIR}/ $HOME/gopath/src/github.com/aptible/supercronic/
-  - export TRAVIS_BUILD_DIR=$HOME/gopath/src/github.com/aptible/supercronic
-  - cd $TRAVIS_BUILD_DIR
-  - go get -u github.com/golang/dep/cmd/dep
+go: "1.14.4"
 
 install:
   - make deps
@@ -22,7 +15,7 @@ jobs:
     - stage: test
       script:
         - make fmt
-        - git diff --exit-code
+        - git diff --exit-code ':(exclude)go.sum'
         - make test
     - stage: build
       script:

Gopkg.lock

@@ -3,15 +3,15 @@ SHELL=/bin/bash
 
 .PHONY: deps
 deps:
-	dep ensure -vendor-only
+	go mod vendor
 
 .PHONY: build
 build: $(GOFILES)
 	go build
 
 .PHONY: unit
 unit:
-	go test $$(go list ./... | grep -v /vendor/)
+	go test -v -race $$(go list ./... | grep -v /vendor/)
 	go vet $$(go list ./... | grep -v /vendor/)
 
 .PHONY: integration

Gopkg.toml

@@ -166,7 +166,11 @@ func startFunc(wg *sync.WaitGroup, exitCtx context.Context, logger *logrus.Entry
 
 			jobWg.Add(1)
 
-			runThisJob := func(cronIteration uint64) {
+			// `nextRun` will be mutated by the next iteration of
+			// this loop, so we cannot simply capture it into the
+			// closure here. Instead, we make it a parameter so
+			// that it gets copied when `runThisJob` is called
+			runThisJob := func(cronIteration uint64, nextRun time.Time) {
 				defer jobWg.Done()
 
 				jobLogger := logger.WithFields(logrus.Fields{
@@ -177,9 +181,9 @@ func startFunc(wg *sync.WaitGroup, exitCtx context.Context, logger *logrus.Entry
 			}
 
 			if overlapping {
-				go runThisJob(cronIteration)
+				go runThisJob(cronIteration, nextRun)
 			} else {
-				runThisJob(cronIteration)
+				runThisJob(cronIteration, nextRun)
 			}
 
 			cronIteration++

Makefile

@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gorhill/cronexpr"
+	"github.com/krallin/cronexpr"
 	"github.com/sirupsen/logrus"
 )
 

cron/cron.go

@@ -0,0 +1,18 @@
+module github.com/aptible/supercronic
+
+go 1.14
+
+require (
+	github.com/certifi/gocertifi v0.0.0-20200211180108-c7c1fbc02894 // indirect
+	github.com/evalphobia/logrus_sentry v0.8.2
+	github.com/getsentry/raven-go v0.2.0 // indirect
+	github.com/golang/protobuf v1.4.0 // indirect
+	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
+	github.com/krallin/cronexpr v0.0.0-20180801141017-b648cc9a908c
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.5.1
+	github.com/prometheus/procfs v0.0.11 // indirect
+	github.com/sirupsen/logrus v1.5.0
+	github.com/stretchr/testify v1.4.0
+	golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
+)