scottk/databunker
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/databunker.git synced 2025-10-31 09:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for -conf argument

Browse Source
This commit is contained in:
stremovsky
2019-12-15 10:03:03 +02:00
parent d06424f0cc
commit 977940136f
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/bunker.go
View File

@@ -185,8 +185,14 @@ func (e mainEnv) setupRouter() *httprouter.Router {
return router return router
} }
func readFile(cfg *Config) error { func readFile(cfg *Config, filepath *string) error {
f, err := os.Open("databunker.yaml") confFile := "databunker.yaml"
if filepath != nil {
if len(*filepath) > 0 {
confFile = *filepath
}
}
f, err := os.Open(confFile)
if err != nil { if err != nil {
return err return err
} }
@@ -205,14 +211,17 @@ func readEnv(cfg *Config) error {
func main() { func main() {
rand.Seed(time.Now().UnixNano()) rand.Seed(time.Now().UnixNano())
lockMemory() lockMemory()
var cfg Config
readFile(&cfg)
readEnv(&cfg)
//fmt.Printf("%+v\n", cfg) //fmt.Printf("%+v\n", cfg)
initPtr := flag.Bool("init", false, "a bool") initPtr := flag.Bool("init", false, "a bool")
masterKeyPtr := flag.String("masterkey", "", "master key") masterKeyPtr := flag.String("masterkey", "", "master key")
dbPtr := flag.String("db", "", "database file") dbPtr := flag.String("db", "", "database file")
confPtr := flag.String("conf", "", "configuration file")
flag.Parse() flag.Parse()
var cfg Config
readFile(&cfg, confPtr)
readEnv(&cfg)
var err error var err error
var masterKey []byte var masterKey []byte
if err != nil { if err != nil {