Merge pull request nyaruka#44 from tybritten/master

Add scheduling options

cmd/rp-archiver/main.go

@@ -80,7 +80,12 @@ func main() {
 	}
 
 	for {
-		start := time.Now().In(time.UTC)
+		// convert the starttime to time.Time
+		layout := "15:04"
+		start, err := time.Parse(layout, config.StartTime)
+		if err != nil {
+			logrus.WithError(err).Fatal("invalid start time supplied")
+		}
 
 		// get our active orgs
 		ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
@@ -115,10 +120,12 @@ func main() {
 			cancel()
 		}
 
-		// ok, we did all our work for our orgs, sleep until the next day
+		// ok, we did all our work for our orgs, quit if so configured or sleep until the next day
+		if config.ExitOnCompletion {
+			break
+		}
 		nextDay := start.AddDate(0, 0, 1)
-		nextDay = time.Date(nextDay.Year(), nextDay.Month(), nextDay.Day(), 0, 1, 0, 0, time.UTC)
-		napTime := nextDay.Sub(start)
+		napTime := nextDay.Sub(time.Now().In(time.UTC))
 
 		if napTime > time.Duration(0) {
 			logrus.WithField("time", napTime).Info("Sleeping until next UTC day")

config.go

@@ -19,10 +19,12 @@ type Config struct {
 	KeepFiles  bool   `help:"whether we should keep local archive files after upload (default false)"`
 	UploadToS3 bool   `help:"whether we should upload archive to S3"`
 
-	ArchiveMessages bool `help:"whether we should archive messages"`
-	ArchiveRuns     bool `help:"whether we should archive runs"`
-	RetentionPeriod int  `help:"the number of days to keep before archiving"`
-	Delete          bool `help:"whether to delete messages and runs from the db after archival (default false)"`
+	ArchiveMessages  bool   `help:"whether we should archive messages"`
+	ArchiveRuns      bool   `help:"whether we should archive runs"`
+	RetentionPeriod  int    `help:"the number of days to keep before archiving"`
+	Delete           bool   `help:"whether to delete messages and runs from the db after archival (default false)"`
+	ExitOnCompletion bool   `help:"whether archiver should exit after completing archiving job (default false)"`
+	StartTime        string `help:"what time archive jobs should run in UTC HH:MM "`
 }
 
 // NewConfig returns a new default configuration object
@@ -44,10 +46,12 @@ func NewConfig() *Config {
 		KeepFiles:  false,
 		UploadToS3: true,
 
-		ArchiveMessages: true,
-		ArchiveRuns:     true,
-		RetentionPeriod: 90,
-		Delete:          false,
+		ArchiveMessages:  true,
+		ArchiveRuns:      true,
+		RetentionPeriod:  90,
+		Delete:           false,
+		ExitOnCompletion: false,
+		StartTime:        "00:01",
 	}
 
 	return &config