Merge 3ac28a5 into 3c006a5

grafana · Jul 28, 2023 · 09b4dec · 09b4dec
2 parents 3c006a5 + 3ac28a5
commit 09b4dec
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/netext/grpcext/conn.go b/lib/netext/grpcext/conn.go
@@ -162,8 +162,11 @@ func (c *Conn) Invoke(
 		// {"x":6,"y":4,"z":0}
 		raw, _ := marshaler.Marshal(resp)
 		msg := make(map[string]interface{})
-		_ = json.Unmarshal(raw, &msg)
+		er := json.Unmarshal(raw, &msg)
 		response.Message = msg
+		if er != nil {
+			response.Message = string(raw)
+		}
 	}
 	return &response, nil
 }