Fix linter errors

handler.go

@@ -26,6 +26,7 @@ func allowed(f http.HandlerFunc, methods ...string) http.HandlerFunc {
 				return
 			}
 		}
+
 		http.Error(w, "Bad method; supported OPTIONS, POST", http.StatusBadRequest)
 	}
 }
@@ -36,13 +37,16 @@ func logger(f http.HandlerFunc, debug bool) http.HandlerFunc {
 		start := time.Now()
 
 		var body []byte
+
 		if debug {
 			// get request body
 			var err error
 			body, err = ioutil.ReadAll(r.Body)
+
 			if err != nil {
 				log.Print(err)
 			}
+
 			r.Body = ioutil.NopCloser(bytes.NewBuffer(body))
 
 			// get response body
@@ -52,7 +56,7 @@ func logger(f http.HandlerFunc, debug bool) http.HandlerFunc {
 		f(w, r)
 
 		duration := time.Since(start)
-		log.Printf("%v %v (%dms)", r.Method, r.URL.Path, duration.Nanoseconds()/1e6)
+		log.Printf("%v %v (%dms)", r.Method, r.URL.Path, duration.Milliseconds())
 
 		if debug {
 			log.Println("Request:\n" + string(body))

main.go

@@ -13,10 +13,11 @@ import (
 var (
 	version = "development"
 	commit  = "unknown commit"
+	timeout = 30 * time.Second
 )
 
 var apiURL = flag.String("api", "https://demo.volkszaehler.org/middleware.php", "volkszaehler api url")
-var apiTimeout = flag.Duration("timeout", 30*time.Second, "volkszaehler api request timeout")
+var apiTimeout = flag.Duration("timeout", timeout, "volkszaehler api request timeout")
 var url = flag.String("url", "0.0.0.0:8000", "listening address")
 var verbose = flag.Bool("verbose", false, "verbose logging")
 var help = flag.Bool("help", false, "help")

server.go

@@ -181,7 +181,8 @@ func (server *Server) queryHandler(w http.ResponseWriter, r *http.Request) {
 }
 
 func roundTimestampMS(ts int64, group string) int64 {
-	t := time.Unix(ts/1000, 0)
+	const millisPerSecond = 1000
+	t := time.Unix(ts/millisPerSecond, 0)
 
 	switch group {
 	case "hour":
@@ -204,6 +205,7 @@ func (server *Server) executeQuery(qr grafana.QueryRequest) []grafana.QueryRespo
 
 		go func(idx int, target grafana.Target) {
 			var qres grafana.QueryResponse
+
 			context := strings.ToLower(target.Data.Context)
 			if context == "prognosis" {
 				qres = server.queryPrognosis(target)
@@ -223,6 +225,7 @@ func (server *Server) executeQuery(qr grafana.QueryRequest) []grafana.QueryRespo
 			}
 
 			res[idx] = qres
+
 			wg.Done()
 		}(idx, target)
 	}

volkszaehler/client.go

@@ -74,7 +74,7 @@ func (api *client) Get(endpoint string) (io.ReadCloser, error) {
 	}
 
 	duration := time.Since(start)
-	log.Printf("GET %s (%dms)", url, duration.Nanoseconds()/1e6)
+	log.Printf("GET %s (%dms)", url, duration.Milliseconds())
 
 	if api.debug {
 		if err := api.debugResponseBody(resp); err != nil {
@@ -165,9 +165,8 @@ func (api *client) QueryEntity(entity string) (Entity, error) {
 func (api *client) QueryData(uuid string, from time.Time, to time.Time,
 	group string, options string, tuples int,
 ) ([]Tuple, error) {
-	f := from.Unix()
-	t := to.Unix()
-	url := fmt.Sprintf("/data/%s.json?from=%d&to=%d", uuid, f*1000, t*1000)
+	const n2m = int64(time.Millisecond) // nano to milli seconds
+	url := fmt.Sprintf("/data/%s.json?from=%d&to=%d", uuid, from.UnixNano()/n2m, to.UnixNano()/n2m)
 
 	if tuples > 0 {
 		url += fmt.Sprintf("&tuples=%d", tuples)