rkrtechnology/litestream
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing slog calls to commands (#508)

Browse Source
This commit is contained in:
Toni Spets
2023-10-20 03:28:49 +03:00
committed by GitHub
parent fe9ab5c517
commit 9f0e50ddf7
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/litestream/main.go
View File

@@ -93,17 +93,17 @@ func (m *Main) Run(ctx context.Context, args []string) (err error) {
// Wait for signal to stop program. // Wait for signal to stop program.
select { select {
case err = <-c.execCh: case err = <-c.execCh:
fmt.Println("subprocess exited, litestream shutting down") slog.Info("subprocess exited, litestream shutting down")
case sig := <-signalCh: case sig := <-signalCh:
fmt.Println("signal received, litestream shutting down") slog.Info("signal received, litestream shutting down")
if c.cmd != nil { if c.cmd != nil {
fmt.Println("sending signal to exec process") slog.Info("sending signal to exec process")
if err := c.cmd.Process.Signal(sig); err != nil { if err := c.cmd.Process.Signal(sig); err != nil {
return fmt.Errorf("cannot signal exec process: %w", err) return fmt.Errorf("cannot signal exec process: %w", err)
} }
fmt.Println("waiting for exec process to close") slog.Info("waiting for exec process to close")
if err := <-c.execCh; err != nil && !strings.HasPrefix(err.Error(), "signal:") { if err := <-c.execCh; err != nil && !strings.HasPrefix(err.Error(), "signal:") {
return fmt.Errorf("cannot wait for exec process: %w", err) return fmt.Errorf("cannot wait for exec process: %w", err)
} }
@@ -114,7 +114,7 @@ func (m *Main) Run(ctx context.Context, args []string) (err error) {
if e := c.Close(); e != nil && err == nil { if e := c.Close(); e != nil && err == nil {
err = e err = e
} }
fmt.Println("litestream shut down") slog.Info("litestream shut down")
return err return err
case "restore": case "restore":

7
cmd/litestream/restore.go
View File

@@ -5,6 +5,7 @@ import (
"errors" "errors"
"flag" "flag"
"fmt" "fmt"
"log/slog"
"os" "os"
"strconv" "strconv"
"time" "time"
@@ -52,7 +53,7 @@ func (c *RestoreCommand) Run(ctx context.Context, args []string) (err error) {
return fmt.Errorf("cannot specify a replica URL and the -config flag") return fmt.Errorf("cannot specify a replica URL and the -config flag")
} }
if r, err = c.loadFromURL(ctx, fs.Arg(0), *ifDBNotExists, &opt); err == errSkipDBExists { if r, err = c.loadFromURL(ctx, fs.Arg(0), *ifDBNotExists, &opt); err == errSkipDBExists {
fmt.Println("database already exists, skipping") slog.Info("database already exists, skipping")
return nil return nil
} else if err != nil { } else if err != nil {
return err return err
@@ -62,7 +63,7 @@ func (c *RestoreCommand) Run(ctx context.Context, args []string) (err error) {
*configPath = DefaultConfigPath() *configPath = DefaultConfigPath()
} }
if r, err = c.loadFromConfig(ctx, fs.Arg(0), *configPath, !*noExpandEnv, *ifDBNotExists, &opt); err == errSkipDBExists { if r, err = c.loadFromConfig(ctx, fs.Arg(0), *configPath, !*noExpandEnv, *ifDBNotExists, &opt); err == errSkipDBExists {
fmt.Println("database already exists, skipping") slog.Info("database already exists, skipping")
return nil return nil
} else if err != nil { } else if err != nil {
return err return err
@@ -73,7 +74,7 @@ func (c *RestoreCommand) Run(ctx context.Context, args []string) (err error) {
// If optional flag set, return success. Useful for automated recovery. // If optional flag set, return success. Useful for automated recovery.
if opt.Generation == "" { if opt.Generation == "" {
if *ifReplicaExists { if *ifReplicaExists {
fmt.Println("no matching backups found") slog.Info("no matching backups found")
return nil return nil
} }
return fmt.Errorf("no matching backups found") return fmt.Errorf("no matching backups found")