Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

serverinit: remove unused configPath field 

Change-Id: Ide4c2eb07d7c3353563e5f354e833f9429542b65
This commit is contained in:
Brad Fitzpatrick 2014-08-02 15:10:08 -07:00
parent afe0bfc5ac
commit 14bb3f48e4
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/serverinit/serverinit.go
View File

@ -390,8 +390,7 @@ func handlerTypeWantsAuth(handlerType string) bool {
// the Load function always returns the Config in its low-level format.
type Config struct {
jsonconfig.Obj
UIPath string // Not valid until after InstallHandlers
configPath string // Filesystem path
UIPath string // Not valid until after InstallHandlers
// apps is the list of server apps configured during InstallHandlers,
// and that should be started after camlistored has started serving.
@ -418,8 +417,7 @@ func Load(filename string) (*Config, error) {
return nil, err
}
conf := &Config{
Obj: obj,
configPath: filename,
Obj: obj,
}
if lowLevel := obj.OptionalBool("handlerConfig", false); lowLevel {
@ -453,8 +451,6 @@ func Load(filename string) (*Config, error) {
jsconf, _ := json.MarshalIndent(conf.Obj, "", " ")
log.Printf("From high-level config, generated low-level config: %s", jsconf)
}
conf.configPath = absConfigPath
return conf, nil
}