diff options
Diffstat (limited to 'config.go')
| -rw-r--r-- | config.go | 47 |
1 files changed, 3 insertions, 44 deletions
@@ -41,8 +41,8 @@ func ConfigLoad() *Portmaps { var data []byte var err error - if data, err = loadFile("gus.text"); err != nil { - log.Warn("gus.text failed to load", err) + if data, err = loadFile(fullname); err != nil { + log.Warn("config file failed to load", err) // something went wrong loading the file return nil } @@ -52,7 +52,7 @@ func ConfigLoad() *Portmaps { } p := new(Portmaps) if err = p.UnmarshalTEXT(data); err != nil { - log.Warn("unmarshal failed on gus.text config file", err) + log.Warn("unmarshal failed on config file", err) return nil } @@ -60,47 +60,6 @@ func ConfigLoad() *Portmaps { return p } -/* -func (m *Portmaps) ConfigLoad() error { - var fullname string - if m == nil { - return errors.New("It's not safe to run ConfigLoad() on a nil ?") - } - if os.Getenv("CLOUD_HOME") != "" { - fullname = filepath.Join(os.Getenv("CLOUD_HOME"), "gus.text") - if argv.Config == "" { - argv.Config = fullname - } - } - if argv.Config != "" { - fullname = argv.Config - } - if fullname == "" { - homeDir, _ := os.UserHomeDir() - fullname = filepath.Join(homeDir, ".config/cloud", "gus.text") - argv.Config = fullname - } - - var data []byte - var err error - if data, err = loadFile(); err != nil { - // something went wrong loading the file - return err - } - - if data != nil { - if err = proto.Unmarshal(data, m); err != nil { - log.Warn("broken gus.text config file", "gus.text") - return err - } - return nil - } - - log.Log(INFO, "gus.ConfigLoad() has", m.Len(), "port mappings") - return nil -} -*/ - func loadFile(fullname string) ([]byte, error) { data, err := os.ReadFile(fullname) if errors.Is(err, os.ErrNotExist) { |