summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Manuel <nilslice@gmail.com>2017-01-13 14:35:36 -0800
committerSteve Manuel <nilslice@gmail.com>2017-01-13 14:35:36 -0800
commit7aee4abfff1fdf588a897470da3413455d8d9f87 (patch)
tree54a63aee39c6cc77830a7f66bdfe5f95ecf3eba5
parent1e745959284c7e23280ccba63ca9ae1fcf983f90 (diff)
adding empty config helper in case config has no data
-rw-r--r--system/db/config.go22
1 files changed, 19 insertions, 3 deletions
diff --git a/system/db/config.go b/system/db/config.go
index e023729..8161492 100644
--- a/system/db/config.go
+++ b/system/db/config.go
@@ -135,7 +135,10 @@ func PutConfig(key string, value interface{}) error {
}
if c == nil {
- return nil
+ c, err = emptyConfig()
+ if err != nil {
+ return err
+ }
}
err = json.Unmarshal(c, &kv)
@@ -185,8 +188,10 @@ func LoadCacheConfig() error {
}
if c == nil {
- configCache = make(url.Values)
- return nil
+ c, err = emptyConfig()
+ if err != nil {
+ return err
+ }
}
// convert json => map[string]interface{} => url.Values
@@ -217,3 +222,14 @@ func LoadCacheConfig() error {
return nil
}
+
+func emptyConfig() ([]byte, error) {
+ cfg := &config.Config{}
+
+ data, err := json.Marshal(cfg)
+ if err != nil {
+ return nil, err
+ }
+
+ return data, nil
+}