diff options
| author | Jeff Carr <[email protected]> | 2025-09-21 20:41:30 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-09-21 20:41:30 -0500 |
| commit | 0e805acc675e374b54cad33ef63f282d46b621af (patch) | |
| tree | 041c36609acc3b054350bec299245559d8ad64b0 /load.go | |
| parent | 1dfac22abcf26235c8b21dd2e394f657e06ed556 (diff) | |
make the backup file .text.jsonv0.0.4
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 } |
