From 5c50f4ac95ac012a5320098ed1cd217f8fc91fc4 Mon Sep 17 00:00:00 2001 From: Christopher Ramey Date: Sun, 28 Feb 2021 04:51:35 -0900 Subject: [PATCH] more debuglevel code cleanup --- main.go | 2 +- server/server.go | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 8b5e261..a078896 100644 --- a/main.go +++ b/main.go @@ -118,7 +118,7 @@ func main() { os.Exit(1) } - srv := server.NewServer(cfg, *debuglvl) + srv := server.NewServer(cfg) r, err := srv.Start() if err != nil { diff --git a/server/server.go b/server/server.go index 958843b..8bde9d3 100644 --- a/server/server.go +++ b/server/server.go @@ -13,7 +13,6 @@ type Server struct { workers []*worker cfg *config.Config shutdownc chan bool - debuglvl int http http.Server } @@ -35,7 +34,7 @@ func (srv *Server) Start() (bool, error) { for { select { case r := <-t.C: - if srv.debuglvl > 0 { + if srv.cfg.DebugLevel > 0 { fmt.Printf("interval check at %s\n", r) } for _, w := range srv.workers { @@ -51,15 +50,14 @@ func (srv *Server) Start() (bool, error) { } } -func NewServer(cfg *config.Config, debuglvl int) *Server { +func NewServer(cfg *config.Config) *Server { srv := &Server{ cfg: cfg, - debuglvl: debuglvl, shutdownc: make(chan bool, 1), } for _, g := range cfg.Groups { srv.workers = append( - srv.workers, makeworker(g, debuglvl), + srv.workers, makeworker(g, cfg.DebugLevel), ) } return srv