fix lint issue

grafana · May 27, 2019 · f9014bf · f9014bf
1 parent f94f2dd
commit f9014bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/cmd/promtail/main.go b/cmd/promtail/main.go
@@ -47,13 +47,9 @@ func main() {
 			m.Cancel <- struct{}{}
 		}
 
-		select {
-		case <- errChan:
-			m.Promtail.Shutdown()
-			os.Exit(1)
-		}
-
-		//m.WaitSignals(errChan)
+		<-errChan
+		m.Promtail.Shutdown()
+		os.Exit(1)
 	} else {
 		level.Error(util.Logger).Log("msg", "config file not found", "error", nil)
 		os.Exit(1)

diff --git a/pkg/promtail/promtail.go b/pkg/promtail/promtail.go
@@ -31,7 +31,7 @@ type Promtail struct {
 type Master struct {
 	Promtail   *Promtail
 	defaultCfg *config.Config
-	Cancel chan struct{}
+	Cancel     chan struct{}
 }
 
 func InitMaster(configFile string, cfg config.Config) (*Master, error) {
@@ -46,7 +46,7 @@ func InitMaster(configFile string, cfg config.Config) (*Master, error) {
 	m := &Master{
 		Promtail:   p,
 		defaultCfg: &cfg,
-		Cancel:cancel,
+		Cancel:     cancel,
 	}
 
 	p.Server.HTTP.Path("/reload").Handler(http.HandlerFunc(m.Reload))
@@ -67,7 +67,7 @@ func (m *Master) DoReload() {
 	m.Promtail.Server.Stop()
 
 	// wait old promtail shutdown
-	<- m.Cancel
+	<-m.Cancel
 
 	p, err := New(m.Promtail.configFile, *m.defaultCfg)
 	if err != nil {