Address issues from PR

cmd/kapacitord/main.go

@@ -94,38 +94,33 @@ func (m *Main) Run(args ...string) error {
 
 		// Block until one of the signals above is received
 	Loop:
-		for {
-			select {
-
-			case s := <-signalCh:
-				switch s.String() {
-				case syscall.SIGTERM.String():
-					m.Logger.Println("I! SIGTERM received, initializing clean shutdown...")
-					go func() {
-						cmd.Close()
-					}()
-					break Loop
-
-				case syscall.SIGHUP.String():
-					m.Logger.Println("I! SIGHUP received, Reloading tasks/templates/handlers directory...")
-					if err := cmd.Server.LoadService.Load(); err != nil {
-						m.Logger.Println(fmt.Sprintf("E! Failed to reload tasks/templates/handlers: %s", err))
-						if _, ok := err.(load.HardError); ok {
-							go func() {
-								cmd.Close()
-							}()
-							break Loop
-						}
+		for s := range signalCh {
+			switch s.String() {
+			case syscall.SIGTERM.String():
+				m.Logger.Println("I! SIGTERM received, initializing clean shutdown...")
+				go func() {
+					cmd.Close()
+				}()
+				break Loop
+
+			case syscall.SIGHUP.String():
+				m.Logger.Println("I! SIGHUP received, Reloading tasks/templates/handlers directory...")
+				if err := cmd.Server.LoadService.Load(); err != nil {
+					m.Logger.Println(fmt.Sprintf("E! Failed to reload tasks/templates/handlers: %s", err))
+					if _, ok := err.(load.HardError); ok {
+						go func() {
+							cmd.Close()
+						}()
+						break Loop
 					}
-
-					// This should never happen
-				default:
-					m.Logger.Println("I! Signal received, initializing clean shutdown...")
-					go func() {
-						cmd.Close()
-					}()
-					break Loop
 				}
+
+			default:
+				m.Logger.Println("I! Signal received, initializing clean shutdown...")
+				go func() {
+					cmd.Close()
+				}()
+				break Loop
 			}
 		}
 

cmd/kapacitord/run/command.go

@@ -128,10 +128,6 @@ func (cmd *Command) Run(args ...string) error {
 		return fmt.Errorf("open server: %s", err)
 	}
 
-	if err := s.LoadService.Load(); err != nil {
-		return fmt.Errorf("loading tasks/templates/handlers: %s", err)
-	}
-
 	cmd.Server = s
 
 	// Begin monitoring the server's error channel.

server/server.go

@@ -867,6 +867,10 @@ func (s *Server) Open() error {
 		return err
 	}
 
+	if err := s.LoadService.Load(); err != nil {
+		return fmt.Errorf("loading tasks/templates/handlers: %s", err)
+	}
+
 	go s.watchServices()
 	go s.watchConfigUpdates()