doesnm/quickshare
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(config): change the order of overwriting

Browse source
This commit is contained in:
hexxa 2022-01-29 14:08:07 +08:00 • committed by Hexxa
parent 4d2231b7db
commit d0c0b80eff
3 changed files with 122 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/server/config_load.go
View file

@ -30,27 +30,26 @@ func LoadCfg(opts *Opts) (*gocfg.Cfg, error) {
return nil, err
}
if opts.DbPath != "" {
cfg, err = mergeDbConfig(cfg, opts.DbPath)
if err != nil {
return nil, err
}
} else {
_, err := os.Stat(boltdbpvd.DBName)
if err == nil {
cfg, err = mergeDbConfig(cfg, boltdbpvd.DBName)
} else if err != nil {
if !os.IsNotExist(err) {
return nil, err
}
}
}
cfg, err = mergeConfigFiles(cfg, opts.Configs)
if err != nil {
return nil, err
}
dbPath := cfg.GrabString("Db.DbPath")
if opts.DbPath != "" {
dbPath = opts.DbPath
_, err := os.Stat(dbPath)
if err == nil {
cfg, err = mergeDbConfig(cfg, dbPath)
} else if err != nil {
if !os.IsNotExist(err) {
return nil, err
} else {
fmt.Printf("warning: Database does not exist in (%s), skipped", dbPath)
}
}
}
return mergeArgs(cfg, opts)
}
@ -102,6 +101,9 @@ func mergeArgs(cfg *gocfg.Cfg, opts *Opts) (*gocfg.Cfg, error) {
if opts.Port != 0 {
cfg.SetInt("Server.Port", opts.Port)
}
if opts.DbPath != "" {
cfg.SetString("Db.DbPath", opts.DbPath)
}
return cfg, nil
}