Skip to content

Fix no error when /config.json doesn't exist #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix no error when /config.json doesn't exist #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccca4d1
Fix error not being returned in LoadConfig()
Jager567 Aug 16, 2018
660acc6
Rewrote LoadConfig() to have less nested code
Jager567 Aug 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions engine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,18 @@ func GoFileWalk(rootPath string, includePaths []string) (fileList []string, err
func LoadConfig() (config map[string]interface{}, err error) {
var parsedConfig map[string]interface{}

if _, err := os.Stat("/config.json"); err == nil {
data, err := ioutil.ReadFile("/config.json")
if err != nil {
return nil, err
}
err = json.Unmarshal(data, &parsedConfig)
if _, err := os.Stat("/config.json"); err != nil {
return nil, err
}

if err != nil {
return nil, err
}
data, err := ioutil.ReadFile("/config.json")
if err != nil {
return nil, err
}
err = json.Unmarshal(data, &parsedConfig)

if err != nil {
return nil, err
}

return parsedConfig, nil
Expand Down