lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2025-06-12 10:00:41 +00:00
Code Issues Releases Activity

go vet

Browse Source 
go simple
golint
structcheck
staticcheck
unused
unconvert
This commit is contained in:
Sergey Lanzman
2017-03-11 10:57:06 +02:00
parent 3d5b13d84e
commit feea8877c0
11 changed files with 71 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
config/conf.go
View File

@ -19,7 +19,6 @@ import (
"io/ioutil"
"os"
"io"
"path/filepath"
beeLogger "github.com/beego/bee/logger"
@ -98,32 +97,22 @@ func loadConfig() {
if err != nil {
return nil
}
if fileInfo.IsDir() {
return nil
}
if fileInfo.Name() == "bee.json" {
switch fileInfo.Name() {
case "bee.json":
beeLogger.Log.Info("Loading configuration from 'bee.json'...")
err = parseJSON(path, &Conf)
if err != nil {
beeLogger.Log.Errorf("Failed to parse JSON file: %s", err)
return err
}
return io.EOF
}
if fileInfo.Name() == "Beefile" {
return parseJSON(path, &Conf)
case "Beefile":
beeLogger.Log.Info("Loading configuration from 'Beefile'...")
err = parseYAML(path, &Conf)
if err != nil {
beeLogger.Log.Errorf("Failed to parse YAML file: %s", err)
return err
}
return io.EOF
return parseYAML(path, &Conf)
}
return nil
})
if err != nil {
beeLogger.Log.Errorf("Failed to parse config file: %s", err)
}
// Check format version
if Conf.Version != confVer {
beeLogger.Log.Warn("Your configuration file is outdated. Please do consider updating it.")