1 files changed, 41 insertions, 37 deletions
diff --git a/system/db/config.go b/system/db/config.go
index 48da4b0..5a93353 100644
--- a/system/db/config.go
+++ b/system/db/config.go
@@ -22,49 +22,53 @@ func init() {
 // SetConfig sets key:value pairs in the db for configuration settings
 func SetConfig(data url.Values) error {
 	var j []byte
-	err := store.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("__config"))
 
-		// check for any multi-value fields (ex. checkbox fields)
-		// and correctly format for db storage. Essentially, we need
-		// fieldX.0: value1, fieldX.1: value2 => fieldX: []string{value1, value2}
-		var discardKeys []string
-		for k, v := range data {
-			if strings.Contains(k, ".") {
-				key := strings.Split(k, ".")[0]
-
-				if data.Get(key) == "" {
-					data.Set(key, v[0])
-				} else {
-					data.Add(key, v[0])
-				}
-
-				discardKeys = append(discardKeys, k)
+	// check for any multi-value fields (ex. checkbox fields)
+	// and correctly format for db storage. Essentially, we need
+	// fieldX.0: value1, fieldX.1: value2 => fieldX: []string{value1, value2}
+	var discardKeys []string
+	for k, v := range data {
+		if strings.Contains(k, ".") {
+			key := strings.Split(k, ".")[0]
+
+			if data.Get(key) == "" {
+				data.Set(key, v[0])
+			} else {
+				data.Add(key, v[0])
 			}
-		}
 
-		for _, discardKey := range discardKeys {
-			data.Del(discardKey)
+			discardKeys = append(discardKeys, k)
 		}
+	}
 
-		cfg := &config.Config{}
-		dec := schema.NewDecoder()
-		dec.SetAliasTag("json")     // allows simpler struct tagging when creating a content type
-		dec.IgnoreUnknownKeys(true) // will skip over form values submitted, but not in struct
-		err := dec.Decode(cfg, data)
-		if err != nil {
-			return err
-		}
+	for _, discardKey := range discardKeys {
+		data.Del(discardKey)
+	}
 
-		// check for "invalidate" value to reset the Etag
-		if len(cfg.CacheInvalidate) > 0 && cfg.CacheInvalidate[0] == "invalidate" {
-			cfg.Etag = NewEtag()
-			cfg.CacheInvalidate = []string{}
-		}
+	cfg := &config.Config{}
+	dec := schema.NewDecoder()
+	dec.SetAliasTag("json")     // allows simpler struct tagging when creating a content type
+	dec.IgnoreUnknownKeys(true) // will skip over form values submitted, but not in struct
+	err := dec.Decode(cfg, data)
+	if err != nil {
+		return err
+	}
 
-		j, err = json.Marshal(cfg)
-		if err != nil {
-			return err
+	// check for "invalidate" value to reset the Etag
+	if len(cfg.CacheInvalidate) > 0 && cfg.CacheInvalidate[0] == "invalidate" {
+		cfg.Etag = NewEtag()
+		cfg.CacheInvalidate = []string{}
+	}
+
+	j, err = json.Marshal(cfg)
+	if err != nil {
+		return err
+	}
+
+	err = store.Update(func(tx *bolt.Tx) error {
+		b := tx.Bucket([]byte("__config"))
+		if b == nil {
+			return bolt.ErrBucketNotFound
 		}
 
 		err = b.Put([]byte("settings"), j)
@@ -117,7 +121,7 @@ func ConfigAll() ([]byte, error) {
 	err := store.View(func(tx *bolt.Tx) error {
 		b := tx.Bucket([]byte("__config"))
 		if b == nil {
-			return fmt.Errorf("Error finding bucket: %s", "__config")
+			return bolt.ErrBucketNotFound
 		}
 		_, err := val.Write(b.Get([]byte("settings")))
 		if err != nil {