Ything-RepoMirrors/rqlite
1
0
Fork 0
mirror of https://github.com/rqlite/rqlite.git synced 2026-01-25 04:16:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix sendRequest returning empty byte slice in restore command

Browse Source
This commit is contained in:
Copilot
2025-12-07 21:50:35 -05:00
committed by GitHub
parent d03879ce51
commit c93e734b95
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/rqlite/backup.go
View File

@@ -157,7 +157,7 @@ func restore(ctx *cli.Context, filename string, argv *argT) error {
}
restoreRet := &restoreResponse{}
if err := parseResponse(response, &restoreRet); err != nil {
if err := parseResponse(&response, &restoreRet); err != nil {
return err
}
if !validSQLiteData(restoreFile) {

8
cmd/rqlite/main.go
View File

@@ -601,15 +601,13 @@ func getVersionWithClient(client *http.Client, argv *argT) (string, error) {
return version[0], nil
}
func sendRequest(ctx *cli.Context, makeNewRequest func(string) (*http.Request, error), urlStr string, argv *argT) (*[]byte, error) {
// create a byte-based buffer that implements io.Writer
var buf []byte
w := bytes.NewBuffer(buf)
func sendRequest(ctx *cli.Context, makeNewRequest func(string) (*http.Request, error), urlStr string, argv *argT) ([]byte, error) {
w := bytes.NewBuffer(nil)
_, err := sendRequestW(ctx, makeNewRequest, urlStr, argv, w)
if err != nil {
return nil, err
}
return &buf, nil
return w.Bytes(), nil
}
func sendRequestW(ctx *cli.Context, makeNewRequest func(string) (*http.Request, error), urlStr string, argv *argT, w io.Writer) (int64, error) {