Made goling and go vet happy

operable · Jun 25, 2016 · ae58f69 · ae58f69
1 parent 5e6433a
commit ae58f69
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/relay/dynamic_config.go b/relay/dynamic_config.go
@@ -62,6 +62,7 @@ func (dcu *DynamicConfigUpdater) Run() error {
 	return nil
 }
 
+// Halt tells the DCU to stop.
 func (dcu *DynamicConfigUpdater) Halt() {
 	dcu.control <- 1
 }
@@ -79,7 +80,7 @@ func (dcu *DynamicConfigUpdater) handleBusEvents(conn bus.Connection, event bus.
 func (dcu *DynamicConfigUpdater) dynConfigUpdate(conn bus.Connection, topic string, payload []byte) {
 	defer dcu.refreshTimer.Reset(dcu.refreshInterval)
 	var envelope messages.DynamicConfigsResponseEnvelope
-	decoder := util.NewJsonDecoder(bytes.NewReader(payload))
+	decoder := util.NewJSONDecoder(bytes.NewReader(payload))
 	if err := decoder.Decode(&envelope); err != nil {
 		log.Errorf("Error decoding GetDynamicConfigs result: %s.", err)
 	}

diff --git a/relay/util/json.go b/relay/util/json.go
@@ -5,7 +5,9 @@ import (
 	"io"
 )
 
-func NewJsonDecoder(reader io.Reader) *json.Decoder {
+// NewJSONDecoder creates a new JSON decoder which is configured
+// to NOT mangle big integers.
+func NewJSONDecoder(reader io.Reader) *json.Decoder {
 	decoder := json.NewDecoder(reader)
 	decoder.UseNumber()
 	return decoder

diff --git a/relay/worker/execution.go b/relay/worker/execution.go
@@ -44,7 +44,7 @@ func ExecutionWorker(queue chan interface{}) {
 		invoke := ctx.Value("invoke").(*CommandInvocation)
 		if bufferedReader == nil {
 			bufferedReader = bufio.NewReader(bytes.NewReader(invoke.Payload))
-			decoder = util.NewJsonDecoder(bufferedReader)
+			decoder = util.NewJSONDecoder(bufferedReader)
 		} else {
 			bufferedReader.Reset(bytes.NewReader(invoke.Payload))
 		}

diff --git a/relay/worker/output_parser.go b/relay/worker/output_parser.go
@@ -2,7 +2,6 @@ package worker
 
 import (
 	"bytes"
-	"encoding/json"
 	"fmt"
 	log "github.com/Sirupsen/logrus"
 	"github.com/operable/circuit-driver/api"
@@ -64,7 +63,7 @@ func parseOutput(result api.ExecResult, err error, resp *messages.ExecutionRespo
 		jsonBody := interface{}(nil)
 		remaining := []byte(strings.Join(retained, "\n"))
 
-		d := util.NewJsonDecoder(bytes.NewReader(remaining))
+		d := util.NewJSONDecoder(bytes.NewReader(remaining))
 		if err := d.Decode(&jsonBody); err != nil {
 			resp.Status = "error"
 			resp.StatusMessage = "Command returned invalid JSON."