mirror of
https://github.com/eosswedenorg/thalos
synced 2026-06-16 04:24:56 +02:00
config/config.go: Refactor Load() into Parse() and Load() functions.
This commit is contained in:
parent
edaf662d50
commit
bc5a351853
2 changed files with 9 additions and 9 deletions
|
|
@ -35,7 +35,7 @@ type Config struct {
|
|||
EndBlockNum uint32 `json:"end_block_num"`
|
||||
}
|
||||
|
||||
func Load(filename string) (Config, error) {
|
||||
func Parse(data []byte) (*Config, error) {
|
||||
cfg := Config{
|
||||
StartBlockNum: NULL_BLOCK_NUMBER,
|
||||
EndBlockNum: NULL_BLOCK_NUMBER,
|
||||
|
|
@ -49,15 +49,15 @@ func Load(filename string) (Config, error) {
|
|||
},
|
||||
}
|
||||
|
||||
err := json.Unmarshal(data, &cfg)
|
||||
return &cfg, err
|
||||
}
|
||||
|
||||
func Load(filename string) (*Config, error) {
|
||||
bytes, err := ioutil.ReadFile(filename)
|
||||
if err != nil {
|
||||
return cfg, err
|
||||
return nil, err
|
||||
}
|
||||
|
||||
err = json.Unmarshal(bytes, &cfg)
|
||||
if err != nil {
|
||||
return cfg, err
|
||||
}
|
||||
|
||||
return cfg, nil
|
||||
return Parse(bytes)
|
||||
}
|
||||
|
|
|
|||
2
main.go
2
main.go
|
|
@ -29,7 +29,7 @@ import (
|
|||
// Global variables
|
||||
// ---------------------------
|
||||
|
||||
var conf config.Config
|
||||
var conf *config.Config
|
||||
|
||||
var shClient *shipclient.Client
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue