diff options
Diffstat (limited to 'save.go')
| -rw-r--r-- | save.go | 30 |
1 files changed, 4 insertions, 26 deletions
@@ -6,16 +6,14 @@ import ( "path/filepath" "strings" - "go.wit.com/log" "google.golang.org/protobuf/encoding/protojson" "google.golang.org/protobuf/encoding/prototext" "google.golang.org/protobuf/proto" ) -var ErrProtoFilename error = log.Errorf("proto does not have Filename") +var ErrProtoFilename error = fmt.Errorf("proto does not have Filename") func ConfigSave(pb proto.Message) error { - // log.Infof("ConfigSave() filename=%s %d\n", fullname, len(s)) return saveTEXT(pb, "") } @@ -43,7 +41,7 @@ func SavePB(pb proto.Message, fullname string) error { func saveProto(pb proto.Message, fullname string) error { if !strings.HasSuffix(fullname, ".pb") { // todo: append .text here? - return log.Errorf("%s needs to end in '.pb'", fullname) + return fmt.Errorf("%s needs to end in '.pb'", fullname) } dir, name := filepath.Split(fullname) @@ -59,7 +57,6 @@ func saveProto(pb proto.Message, fullname string) error { return err } - log.Infof("pb.Save() %s (%s)\n", fullname, HumanFormatBytes(len(data))) return configWrite(fullname, data) } @@ -92,7 +89,7 @@ func saveTEXT(pb proto.Message, header string) error { } if !strings.HasSuffix(fullname, ".text") { // todo: append .text here? - return log.Errorf("not .text file: %s", fullname) + return fmt.Errorf("not .text file: %s", fullname) } dir, name := filepath.Split(fullname) @@ -109,7 +106,6 @@ func saveTEXT(pb proto.Message, header string) error { if err != nil { return err } - log.Infof("pb.Save() %s (%s)\n", fullname, HumanFormatBytes(len(data))) return nil } @@ -121,7 +117,7 @@ func saveJSON(pb proto.Message) error { } if !strings.HasSuffix(fullname, ".text") { // todo: append .text here? - return log.Errorf("not .text file: %s", fullname) + return fmt.Errorf("not .text file: %s", fullname) } dir, name := filepath.Split(fullname) @@ -140,7 +136,6 @@ func saveJSON(pb proto.Message) error { if err != nil { return err } - log.Infof("pb.Save() %s (%s)\n", fullname, HumanFormatBytes(len(data))) return nil } @@ -148,25 +143,8 @@ func configWrite(fullname string, data []byte) error { cfgfile, err := os.OpenFile(fullname, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644) defer cfgfile.Close() if err != nil { - log.Warn("open config file :", err) return err } _, err = cfgfile.Write(data) return err } - -/* -func (e *Events) Save() { - var fullname string - base, _ := filepath.Split(argv.Config) - fullname = filepath.Join(base, "events.pb") - - data, err := e.Marshal() - if err != nil { - log.Info("proto.Marshal() failed", err) - return - } - log.Info("proto.Marshal() worked len", len(data)) - configWrite(fullname, data) -} -*/ |
