Merge pull request #242 from jotak/log-unmarshal

[Trivial] Add error logs on unmarshal errors

pkg/handler/loki.go

@@ -73,6 +73,7 @@ func getLokiError(resp []byte, code int) string {
 	}
 	err := json.Unmarshal(resp, &f)
 	if err != nil {
+		hlog.WithError(err).Errorf("cannot unmarshal, response was: %v", string(resp))
 		return fmt.Sprintf("Unknown error from Loki\ncannot unmarshal\n%s", resp)
 	}
 	message, ok := f["message"]
@@ -115,6 +116,7 @@ func fetchSingle(lokiClient httpclient.Caller, flowsURL string, merger loki.Merg
 	}
 	var qr model.QueryResponse
 	if err := json.Unmarshal(resp, &qr); err != nil {
+		hlog.WithError(err).Errorf("cannot unmarshal, response was: %v", string(resp))
 		return http.StatusInternalServerError, err
 	}
 	if _, err := merger.Add(qr.Data); err != nil {
@@ -146,6 +148,7 @@ func fetchParallel(lokiClient httpclient.Caller, queries []string, merger loki.M
 				var qr model.QueryResponse
 				err := json.Unmarshal(resp, &qr)
 				if err != nil {
+					hlog.WithError(err).Errorf("cannot unmarshal, response was: %v", string(resp))
 					errChan <- errorWithCode{err: err, code: http.StatusInternalServerError}
 				} else {
 					resChan <- qr
@@ -240,6 +243,7 @@ func LokiConfig(cfg *loki.Config, param string) func(w http.ResponseWriter, r *h
 		cfg := make(map[string]interface{})
 		err = yaml.Unmarshal(resp, &cfg)
 		if err != nil {
+			hlog.WithError(err).Errorf("cannot unmarshal, response was: %v", string(resp))
 			writeError(w, code, err.Error())
 			return
 		}

pkg/handler/resources.go

@@ -137,6 +137,7 @@ func getNamesForPrefix(cfg *loki.Config, lokiClient httpclient.Caller, prefix, k
 	var qr model.QueryResponse
 	err = json.Unmarshal(resp, &qr)
 	if err != nil {
+		hlog.WithError(err).Errorf("cannot unmarshal, response was: %v", string(resp))
 		return nil, http.StatusInternalServerError, errors.New("Failed to unmarshal Loki response: " + err.Error())
 	}