Fix linting errors

cmd/sdm/main.go

@@ -330,11 +330,11 @@ func main() {
 			waitForSignal(os.Interrupt, os.Kill)
 			log.Println("Received signal - stopping")
 			cancelScheduler() // cancel scheduler
-			select {          // wait for Run methods attached to tee to finish
-			case <-tee.Done():
-				log.Println("Stopped")
-				os.Exit(0)
-			}
+
+			// wait for Run methods attached to tee to finish
+			<-tee.Done()
+			log.Println("Stopped")
+			os.Exit(0)
 		}()
 
 		Run_httpd(

homie.go

@@ -131,9 +131,7 @@ func (m *HomieRunner) publishProperties(subtopic string, meter *Meter, qe *Modbu
 			Operation: op,
 		}
 		if b, err := qe.Query(snip); err == nil {
-			for _, snip := range qe.Transform(snip, b) {
-				snips = append(snips, snip)
-			}
+			snips = append(snips, qe.Transform(snip, b)...)
 		}
 	}
 
@@ -183,9 +181,6 @@ func (m *HomieRunner) unpublish(subtopic string) {
 
 		topic := msg.Topic()
 		token := m.client.Publish(topic, byte(m.mqttQos), true, []byte{})
-		if m.verbose {
-			// log.Printf("MQTT: unpublish %s", topic)
-		}
 
 		mux.Lock()
 		defer mux.Unlock()
@@ -194,17 +189,15 @@ func (m *HomieRunner) unpublish(subtopic string) {
 	mux.Unlock()
 
 	// wait for timeout according to specification
-	select {
-	case <-time.After(timeout):
-		mux.Lock()
-		defer mux.Unlock()
+	<-time.After(timeout)
+	mux.Lock()
+	defer mux.Unlock()
 
-		// stop listening
-		m.client.Unsubscribe(topic)
+	// stop listening
+	m.client.Unsubscribe(topic)
 
-		// wait for tokens
-		for _, token := range tokens {
-			m.WaitForToken(token)
-		}
+	// wait for tokens
+	for _, token := range tokens {
+		m.WaitForToken(token)
 	}
 }

measurementcache.go

@@ -54,9 +54,6 @@ func (mc *MeasurementCache) Run(in QuerySnipChannel) {
 		if meter, ok := mc.meters[devid]; ok {
 			// add the snip to the cache
 			meter.AddSnip(snip)
-			if mc.verbose {
-				// log.Printf("%s\r\n", meter.Current.String())
-			}
 		} else {
 			log.Fatalf("Snip for unknown meter received - this should not happen (%v).", snip)
 		}
@@ -75,7 +72,7 @@ func (mc *MeasurementCache) Purge(deviceId byte) error {
 
 func (mc *MeasurementCache) GetSortedIDs() []byte {
 	var keys ByteSlice
-	for k, _ := range mc.meters {
+	for k := range mc.meters {
 		keys = append(keys, k)
 	}
 	sort.Sort(keys)

meters/impl/inepro.go

@@ -82,7 +82,7 @@ func (p *IneproProducer) Probe() Operation {
 }
 
 func (p *IneproProducer) Produce() (res []Operation) {
-	for op, _ := range p.Opcodes {
+	for op := range p.Opcodes {
 		res = append(res, p.snip(op))
 	}
 

scheduler.go

@@ -229,8 +229,6 @@ func (q *MeterScheduler) Run(ctx context.Context, rate time.Duration) {
 	go q.handleControlSnips()
 
 	// wait for cancel
-	select {
-	case <-ctx.Done():
-		done <- true
-	}
+	<-ctx.Done()
+	done <- true
 }

socket.go

@@ -40,12 +40,10 @@ func (c *Client) writePump() {
 		c.conn.Close()
 	}()
 	for {
-		select {
-		case msg := <-c.send:
-			c.conn.SetWriteDeadline(time.Now().Add(socketWriteWait))
-			if err := c.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
-				return
-			}
+		msg := <-c.send
+		c.conn.SetWriteDeadline(time.Now().Add(socketWriteWait))
+		if err := c.conn.WriteMessage(websocket.TextMessage, msg); err != nil {
+			return
 		}
 	}
 }