diff options
Diffstat (limited to 'load.go')
| -rw-r--r-- | load.go | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -42,7 +42,6 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error { } if strings.HasSuffix(fullname, ".text") { - fullname = strings.TrimSuffix(fullname, ".text") fullname += ".json" if err := loadJSON(pb, fullname); err != nil { return err @@ -57,10 +56,10 @@ func ConfigLoad(pb proto.Message, argname string, protoname string) error { func loadTEXT(pb proto.Message, fullname string) error { var data []byte var err error + SetFilename(pb, fullname) if data, err = loadFile(fullname); err != nil { log.Warn("config file failed to load", err) // set pb.Filename that was attempted - SetFilename(pb, fullname) return err } @@ -90,13 +89,13 @@ func loadTEXT(pb proto.Message, fullname string) error { return nil } +// json files are backup Marshal() data in case .text Unmarshal() fails +// they always should have the ".text" filename in them func loadJSON(pb proto.Message, fullname string) error { var data []byte var err error if data, err = loadFile(fullname); err != nil { log.Warn("config file failed to load", err) - // set pb.Filename that was attempted - SetFilename(pb, fullname) return err } |
