clean up jobs

server/server.go

@@ -188,11 +188,10 @@ func (s *Server) StartHTTP(listenAddr string) (funcExecute, funcInterrupt) {
 		WriteTimeout: 80 * time.Second,
 		IdleTimeout:  60 * time.Second,
 	}
-	execute := func() error {
+	return func() error {
 			log.Print("starting job 'http'\n")
 			return list.ListenAndServe()
-	}
+		}, func(_ error) {
-	return execute, func(_ error) {
 			// stop job
 			list.Close()
 		}
@@ -201,8 +200,7 @@ func (s *Server) StartHTTP(listenAddr string) (funcExecute, funcInterrupt) {
 func (s *Server) StartScanTicker(dur time.Duration) (funcExecute, funcInterrupt) {
 	ticker := time.NewTicker(dur)
 	done := make(chan struct{})
-	execute := func() error {
+	waitFor := func() error {
-		log.Printf("starting job 'scan timer'\n")
 		for {
 			select {
 			case <-done:
@@ -214,7 +212,10 @@ func (s *Server) StartScanTicker(dur time.Duration) (funcExecute, funcInterrupt)
 			}
 		}
 	}
-	return execute, func(_ error) {
+	return func() error {
+			log.Printf("starting job 'scan timer'\n")
+			return waitFor()
+		}, func(_ error) {
 			// stop job
 			ticker.Stop()
 			done <- struct{}{}
@@ -222,11 +223,10 @@ func (s *Server) StartScanTicker(dur time.Duration) (funcExecute, funcInterrupt)
 }
 
 func (s *Server) StartJukebox() (funcExecute, funcInterrupt) {
-	execute := func() error {
+	return func() error {
 			log.Printf("starting job 'jukebox'\n")
 			return s.jukebox.Listen()
-	}
+		}, func(_ error) {
-	return execute, func(_ error) {
 			// stop job
 			s.jukebox.Quit()
 		}