add sample cron file and fix scheduler

master
bel 2020-03-13 05:06:03 +00:00
parent 877ec310bd
commit dbf023e61b
3 changed files with 24 additions and 15 deletions

33
main.go
View File

@ -3,10 +3,8 @@ package main
import ( import (
"local/firestormy/config" "local/firestormy/config"
"local/firestormy/scheduler" "local/firestormy/scheduler"
"local/firestormy/server"
"local/lastn/lastn" "local/lastn/lastn"
"log" "log"
"net/http"
"os" "os"
"os/signal" "os/signal"
"path/filepath" "path/filepath"
@ -17,27 +15,32 @@ func main() {
var err error var err error
s := scheduler.New() s := scheduler.New()
if config.Config != "" { if config.Config != "" {
var err error
s, err = scheduler.NewFromFile(config.Config) s, err = scheduler.NewFromFile(config.Config)
} else { if err != nil {
err = s.Start() panic(err)
}
} }
err = s.Start()
if err != nil { if err != nil {
panic(err) panic(err)
} }
server := server.New() /*
if err := server.Routes(); err != nil { server := server.New()
panic(err) if err := server.Routes(); err != nil {
}
go EnqueueBackups()
go func() {
log.Printf("Serving on %q", config.Port)
if err := http.ListenAndServe(config.Port, server); err != nil {
panic(err) panic(err)
} }
}()
go EnqueueBackups()
go func() {
log.Printf("Serving on %q", config.Port)
if err := http.ListenAndServe(config.Port, server); err != nil {
panic(err)
}
}()
*/
// catch stop // catch stop
stop := make(chan os.Signal) stop := make(chan os.Signal)

View File

@ -102,6 +102,11 @@ func (s *Scheduler) Start() error {
} }
} }
s.cron.Start() s.cron.Start()
entries := s.cron.Entries()
logger.New().Info("started", len(entries), "jobs")
for _, entry := range entries {
logger.New().Info(fmt.Sprintf("%+v", entry))
}
return nil return nil
} }

1
testdata/hostname_per_second.cron vendored Normal file
View File

@ -0,0 +1 @@
* * * * * * hostname