Fix tests to pass on linux
This commit is contained in:
@@ -1,9 +1,14 @@
|
||||
package scheduler
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"local/firestormy/config"
|
||||
"local/firestormy/logger"
|
||||
"regexp"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
cron "github.com/robfig/cron/v3"
|
||||
@@ -30,6 +35,61 @@ func New() *Scheduler {
|
||||
}
|
||||
}
|
||||
|
||||
func NewFromFile(config string) (*Scheduler, error) {
|
||||
f, err := ioutil.ReadFile(config)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
s := New()
|
||||
for _, line := range bytes.Split(f, []byte("\n")) {
|
||||
line = cleanLine(line)
|
||||
if len(line) == 0 {
|
||||
continue
|
||||
}
|
||||
schedule, command := splitScheduleCommand(line)
|
||||
if len(schedule) == 0 || len(command) == 0 {
|
||||
continue
|
||||
}
|
||||
job, err := NewJob(Bash, schedule, command)
|
||||
if err != nil {
|
||||
logger.New().Error(err, "cannot fully parse file: new job error", config, ", sched", schedule, ", comm", command)
|
||||
continue
|
||||
}
|
||||
if err := s.Add(job); err != nil {
|
||||
logger.New().Error(err, "cannot fully parse file: add job error", config)
|
||||
continue
|
||||
}
|
||||
}
|
||||
jobs, _ := s.List()
|
||||
if len(jobs) == 0 {
|
||||
return nil, errors.New("no jobs parsed from file " + config)
|
||||
}
|
||||
return s, nil
|
||||
}
|
||||
|
||||
func cleanLine(b []byte) []byte {
|
||||
b = bytes.Trim(b, "\t \n")
|
||||
if len(b) == 0 {
|
||||
return nil
|
||||
}
|
||||
if b[0] == '#' {
|
||||
return nil
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
func splitScheduleCommand(b []byte) (string, string) {
|
||||
re := regexp.MustCompile(`^((\d+|\*\/\d+|(\d,)*\d+|\*) [ ]*){5}`)
|
||||
schedule := string(re.Find(b))
|
||||
if len(schedule) == 0 {
|
||||
return "", ""
|
||||
}
|
||||
command := strings.TrimPrefix(string(b), schedule)
|
||||
schedule = strings.TrimSpace(schedule)
|
||||
command = strings.TrimSpace(command)
|
||||
return schedule, command
|
||||
}
|
||||
|
||||
func (s *Scheduler) Start() error {
|
||||
jobs, err := s.List()
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user