adding more error handling on buffer writes, removing old code

2 files changed, 8 insertions, 11 deletions

diff --git a/system/api/handlers.go b/system/api/handlers.go
index 788b2a0..7b59dbd 100644
--- a/system/api/handlers.go
+++ b/system/api/handlers.go
@@ -180,15 +180,6 @@ func toJSON(data []string) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func wrapJSON(json []byte) []byte {
-	var buf = &bytes.Buffer{}
-	buf.Write([]byte(`{"data":`))
-	buf.Write(json)
-	buf.Write([]byte(`}`))
-
-	return buf.Bytes()
-}
-
 // sendData() should be used any time you want to communicate
 // data back to a foreign client
 func sendData(res http.ResponseWriter, data []byte, code int) {
@@ -196,7 +187,10 @@ func sendData(res http.ResponseWriter, data []byte, code int) {
 	res.Header().Set("Access-Control-Allow-Origin", "*")
 	res.Header().Set("Content-Type", "application/json")
 	res.WriteHeader(code)
-	res.Write(data)
+	_, err := res.Write(data)
+	if err != nil {
+		log.Println("Error writing to response in sendData")
+	}
 }
 
 // SendPreflight is used to respond to a cross-origin "OPTIONS" request
diff --git a/system/db/config.go b/system/db/config.go
index ce76021..45b3952 100644
--- a/system/db/config.go
+++ b/system/db/config.go
@@ -108,7 +108,10 @@ func ConfigAll() ([]byte, error) {
 	val := &bytes.Buffer{}
 	err := store.View(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte("__config"))
-		val.Write(b.Get([]byte("settings")))
+		_, err := val.Write(b.Get([]byte("settings")))
+		if err != nil {
+			return err
+		}
 
 		return nil
 	})