Change json.NewDecoder to json.Unmarshal in binaries

cmd/apps/skychat/chat.go

@@ -9,6 +9,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"net"
 	"net/http"
 	"sync"
@@ -132,8 +133,14 @@ func handleConn(conn net.Conn) {
 }
 
 func messageHandler(w http.ResponseWriter, req *http.Request) {
+	raw, err := ioutil.ReadAll(req.Body)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
 	data := map[string]string{}
-	if err := json.NewDecoder(req.Body).Decode(&data); err != nil {
+	if err := json.Unmarshal(raw, &data); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
@@ -171,12 +178,13 @@ func messageHandler(w http.ResponseWriter, req *http.Request) {
 		go handleConn(conn)
 	}
 
-	_, err := conn.Write([]byte(data["message"]))
-	if err != nil {
+	if _, err := conn.Write([]byte(data["message"])); err != nil {
 		http.Error(w, err.Error(), http.StatusBadRequest)
+
 		connsMu.Lock()
 		delete(chatConns, pk)
 		connsMu.Unlock()
+
 		return
 	}
 

cmd/setup-node/commands/root.go

@@ -4,6 +4,7 @@ import (
 	"bufio"
 	"encoding/json"
 	"io"
+	"io/ioutil"
 	"log"
 	"log/syslog"
 	"net/http"
@@ -62,10 +63,18 @@ var rootCmd = &cobra.Command{
 		}
 
 		conf := &setup.Config{}
-		if err := json.NewDecoder(rdr).Decode(&conf); err != nil {
-			log.Fatalf("Failed to decode %s: %s", rdr, err)
+
+		raw, err := ioutil.ReadAll(rdr)
+		if err != nil {
+			logger.Fatalf("Failed to read config: %v", err)
 		}
 
+		if err := json.Unmarshal(raw, &conf); err != nil {
+			logger.WithField("raw", string(raw)).Fatalf("Failed to decode config: %s", err)
+		}
+
+		logger.Infof("Config: %#v", conf)
+
 		sn, err := setup.NewNode(conf, metrics.NewPrometheus("setupnode"))
 		if err != nil {
 			logger.Fatal("Failed to create a setup node: ", err)

cmd/skywire-visor/commands/root.go

@@ -171,10 +171,17 @@ func (cfg *runCfg) readConfig() *runCfg {
 		rdr = bufio.NewReader(os.Stdin)
 	}
 
-	if err := json.NewDecoder(rdr).Decode(&cfg.conf); err != nil {
-		cfg.logger.Fatalf("Failed to decode %s: %s", rdr, err)
+	raw, err := ioutil.ReadAll(rdr)
+	if err != nil {
+		cfg.logger.Fatalf("Failed to read config: %v", err)
+	}
+
+	if err := json.Unmarshal(raw, &cfg.conf); err != nil {
+		cfg.logger.WithField("raw", string(raw)).Fatalf("Failed to decode config: %s", err)
 	}
 
+	cfg.logger.Infof("Config: %#v", &cfg.conf)
+
 	cfg.conf.Path = configPath
 
 	return cfg

pkg/visor/config.go

@@ -85,7 +85,7 @@ func (c *Config) flush() error {
 		return ErrNoConfigPath
 	}
 
-	c.log.Infof("Updating visor config to %+v", c)
+	c.log.Infof("Updating visor config to %#v", c)
 
 	bytes, err := json.MarshalIndent(c, "", "\t")
 	if err != nil {