cascade/ipfs-cluster
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set envconfig version (more or less), and move setDefaults down a bit.

Browse Source 
License: MIT
Signed-off-by: Hector Sanjuan <code@hector.link>
This commit is contained in:
Hector Sanjuan 2018-10-29 14:53:59 +01:00
parent 3ab3c2afa0
commit 0b923f8d49
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster_config.go
View File

@ -273,8 +273,6 @@ func (cfg *Config) setDefaults() {
// sets the Config fields from it. Note that it should be JSON // sets the Config fields from it. Note that it should be JSON
// as generated by ToJSON(). // as generated by ToJSON().
func (cfg *Config) LoadJSON(raw []byte) error { func (cfg *Config) LoadJSON(raw []byte) error {
cfg.setDefaults()
jcfg := &configJSON{} jcfg := &configJSON{}
err := json.Unmarshal(raw, jcfg) err := json.Unmarshal(raw, jcfg)
if err != nil { if err != nil {
@ -282,6 +280,8 @@ func (cfg *Config) LoadJSON(raw []byte) error {
return err return err
} }
cfg.setDefaults()
if jcfg.Peers != nil || jcfg.Bootstrap != nil { if jcfg.Peers != nil || jcfg.Bootstrap != nil {
logger.Error(` logger.Error(`
Your configuration is using cluster.Peers and/or cluster.Bootstrap Your configuration is using cluster.Peers and/or cluster.Bootstrap

4
package.json
View File

@ -152,9 +152,9 @@
}, },
{ {
"author": "lanzafame", "author": "lanzafame",
"hash": "QmVPrFJ6dYJyt7uULgE7wouhvXDzYBZVjYvjMCE5Uqxgfy", "hash": "QmYgGtLm9WJRgh6iuaZap8qVC1gqixFbZCNfhjLNBhWMCm",
"name": "envconfig", "name": "envconfig",
"version": "0.0.0" "version": "1.3.1"
} }
], ],
"gxVersion": "0.11.0", "gxVersion": "0.11.0",