Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions encoder.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package rdb

import (
"errors"
"fmt"
"math"
"time"
Expand All @@ -17,10 +18,10 @@ type FileEncoder struct {
}

func NewFileEncoder(path string, redisVersion string) (*FileEncoder, error) {
w, err := newFileWriter(path)
if redisVersion == "" {
return nil, fmt.Errorf("missing Redis version")
}
w, err := newFileWriter(path)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -238,8 +239,15 @@ func (s *FileEncoder) WriteLibrary(code string) error {
return s.writeString(code)
}

func (s *FileEncoder) Close() error {
err := s.writeEOF()
func (s *FileEncoder) Close() (err error) {
defer func() {
cErr := s.writer.Close()
if cErr != nil {
err = errors.Join(err, cErr)
}
}()

err = s.writeEOF()
if err != nil {
return err
}
Expand Down
4 changes: 0 additions & 4 deletions rdb_file_writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,6 @@ func (fw FileWriter) Flush() error {
}

func (fw FileWriter) Close() error {
err := fw.w.Flush()
if err != nil {
return err
}
return fw.f.Close()
}

Expand Down
Loading