diff options
Diffstat (limited to 'load.go')
| -rw-r--r-- | load.go | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -71,9 +71,10 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error { } func Load(pb proto.Message) error { - fullname, ok := GetFilename(pb) - if !ok { - return ErrProtoFilename + fullname, err := GetFilename(pb) + if err != nil { + log.Info("filename =", fullname, err) + return err } if strings.HasSuffix(fullname, ".text") { return loadTEXT(pb, fullname) @@ -171,7 +172,7 @@ func loadTEXT(pb proto.Message, fullname string) error { return ErrMarshal } - if fn, ok := GetFilename(pb); ok { + if fn, err := GetFilename(pb); err != nil { if fn != fullname { log.Info("config.ConfigLoad() new filename:", fullname) SetFilename(pb, fullname) @@ -207,7 +208,7 @@ func loadJSON(pb proto.Message, fullname string) error { return ErrMarshal } - if fn, ok := GetFilename(pb); ok { + if fn, err := GetFilename(pb); err != nil { if fn != fullname { log.Info("config.ConfigLoad() new filename:", fullname) SetFilename(pb, fullname) |