lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-22 15:10:54 +00:00
Code Issues Releases Activity

Merge pull request #344 from amrfaissal/fix-183

Browse Source 
hotfix: Configuration loading from JSON and YAML
This commit is contained in:
Faissal Elamraoui 2016-12-26 13:49:26 +01:00 committed by GitHub
commit bbe1a4efe3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
conf.go
View File

@ -90,7 +90,7 @@ func loadConfig() (err error) {
if fileInfo.Name() == "bee.json" { if fileInfo.Name() == "bee.json" {
logger.Info("Loading configuration from 'bee.json'...") logger.Info("Loading configuration from 'bee.json'...")
err = parseJSON(path, conf) err = parseJSON(path, &conf)
if err != nil { if err != nil {
logger.Errorf("Failed to parse JSON file: %s", err) logger.Errorf("Failed to parse JSON file: %s", err)
return err return err
@ -100,7 +100,7 @@ func loadConfig() (err error) {
if fileInfo.Name() == "Beefile" { if fileInfo.Name() == "Beefile" {
logger.Info("Loading configuration from 'Beefile'...") logger.Info("Loading configuration from 'Beefile'...")
err = parseYAML(path, conf) err = parseYAML(path, &conf)
if err != nil { if err != nil {
logger.Errorf("Failed to parse YAML file: %s", err) logger.Errorf("Failed to parse YAML file: %s", err)
return err return err
@ -151,7 +151,7 @@ func parseJSON(path string, v interface{}) error {
if err != nil { if err != nil {
return err return err
} }
err = json.Unmarshal(data, &v) err = json.Unmarshal(data, v)
if err != nil { if err != nil {
return err return err
} }
@ -167,7 +167,7 @@ func parseYAML(path string, v interface{}) error {
if err != nil { if err != nil {
return err return err
} }
err = yaml.Unmarshal(data, &v) err = yaml.Unmarshal(data, v)
if err != nil { if err != nil {
return err return err
} }