diff --git a/main.go b/main.go index 4f86f37..f561675 100755 --- a/main.go +++ b/main.go @@ -3,10 +3,8 @@ package main import ( "local/firestormy/config" "local/firestormy/scheduler" - "local/firestormy/server" "local/lastn/lastn" "log" - "net/http" "os" "os/signal" "path/filepath" @@ -17,27 +15,32 @@ func main() { var err error s := scheduler.New() if config.Config != "" { + var err error s, err = scheduler.NewFromFile(config.Config) - } else { - err = s.Start() + if err != nil { + panic(err) + } } + err = s.Start() if err != nil { panic(err) } - server := server.New() - if err := server.Routes(); err != nil { - panic(err) - } - - go EnqueueBackups() - - go func() { - log.Printf("Serving on %q", config.Port) - if err := http.ListenAndServe(config.Port, server); err != nil { + /* + server := server.New() + if err := server.Routes(); err != nil { 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 stop := make(chan os.Signal) diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index d3a55d6..40f0d8a 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -102,6 +102,11 @@ func (s *Scheduler) Start() error { } } 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 } diff --git a/testdata/hostname_per_second.cron b/testdata/hostname_per_second.cron new file mode 100644 index 0000000..e1c619a --- /dev/null +++ b/testdata/hostname_per_second.cron @@ -0,0 +1 @@ +* * * * * * hostname