From 75fbb8244086a2ad964d1c51e3bdbdfb95df90ac Mon Sep 17 00:00:00 2001 From: Joe Chen Date: Sat, 11 Jun 2022 11:10:25 +0800 Subject: db: use `context` for backup and restore (#7044) --- internal/cmd/backup.go | 3 ++- internal/cmd/restore.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'internal/cmd') diff --git a/internal/cmd/backup.go b/internal/cmd/backup.go index c5e17e16..69d9b788 100644 --- a/internal/cmd/backup.go +++ b/internal/cmd/backup.go @@ -5,6 +5,7 @@ package cmd import ( + "context" "fmt" "io/ioutil" "os" @@ -94,7 +95,7 @@ func runBackup(c *cli.Context) error { // Database dbDir := filepath.Join(rootDir, "db") - if err = db.DumpDatabase(conn, dbDir, c.Bool("verbose")); err != nil { + if err = db.DumpDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { log.Fatal("Failed to dump database: %v", err) } if err = z.AddDir(archiveRootDir+"/db", dbDir); err != nil { diff --git a/internal/cmd/restore.go b/internal/cmd/restore.go index dfa2bfc1..f38a7fdd 100644 --- a/internal/cmd/restore.go +++ b/internal/cmd/restore.go @@ -5,6 +5,7 @@ package cmd import ( + "context" "os" "path" "path/filepath" @@ -114,7 +115,7 @@ func runRestore(c *cli.Context) error { // Database dbDir := path.Join(archivePath, "db") - if err = db.ImportDatabase(conn, dbDir, c.Bool("verbose")); err != nil { + if err = db.ImportDatabase(context.Background(), conn, dbDir, c.Bool("verbose")); err != nil { log.Fatal("Failed to import database: %v", err) } -- cgit v1.2.3