containers/mumbledj
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed config loading, some formatting

Browse source
This commit is contained in:
Matthieu Grieger 2014-12-15 16:41:15 -08:00
parent 687bef93c9
commit e7afe60331
1 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
parseconfig.go
View file

@ -9,6 +9,9 @@ package main
import ( import (
"code.google.com/p/gcfg" "code.google.com/p/gcfg"
"errors"
"fmt"
"os/user"
) )
type DjConfig struct { type DjConfig struct {
@ -42,6 +45,11 @@ type DjConfig struct {
} }
} }
func loadConfiguration() (error) { func loadConfiguration() error {
return gcfg.ReadFileInto(&dj.conf, "mumbledj.gcfg") usr, err := user.Current()
if err == nil {
return gcfg.ReadFileInto(&dj.conf, fmt.Sprintf("%s/.mumbledj/config/mumbledj.gcfg", usr.HomeDir))
} else {
return errors.New("Configuration load failed.")
}
} }