From 14bb3f48e4f71f2a0bc7447365f1c6065fed7e93 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sat, 2 Aug 2014 15:10:08 -0700 Subject: [PATCH] serverinit: remove unused configPath field Change-Id: Ide4c2eb07d7c3353563e5f354e833f9429542b65 --- pkg/serverinit/serverinit.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkg/serverinit/serverinit.go b/pkg/serverinit/serverinit.go index 1b2a61c09..038095424 100644 --- a/pkg/serverinit/serverinit.go +++ b/pkg/serverinit/serverinit.go @@ -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 }