Compare commits

..

4 Commits

Author SHA1 Message Date
Boris Bera
061e795e21
Merge 0fdf9c77ae into f7d28b486c 2024-11-10 19:00:14 +00:00
Boris Bera
0fdf9c77ae
feat(config): allow specifying lockfile 2024-11-10 13:57:05 -05:00
Boris Bera
8de8d0070e
chore: move lockfile code to internal module
In a future commit, I'll need the lockfile code to access the config
file. This solves an import cycle.
2024-11-10 13:37:59 -05:00
Boris Bera
ccca7c850f
Merge branch 'master' into lockfile-path-config 2024-11-10 13:24:42 -05:00
13 changed files with 48 additions and 43 deletions

View File

@ -6,7 +6,6 @@ import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -15,9 +14,9 @@ var backupCmd = &cobra.Command{
Short: "Create backups for given locations", Short: "Create backups for given locations",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, false) selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err) CheckErr(err)

View File

@ -3,7 +3,6 @@ package cmd
import ( import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -12,9 +11,9 @@ var checkCmd = &cobra.Command{
Short: "Check if everything is setup", Short: "Check if everything is setup",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
CheckErr(internal.CheckConfig()) CheckErr(internal.CheckConfig())

View File

@ -3,7 +3,6 @@ package cmd
import ( import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/flags" "github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -13,9 +12,9 @@ var cronCmd = &cobra.Command{
Long: `Intended to be mainly triggered by an automated system like systemd or crontab. For each location checks if a cron backup is due and runs it.`, Long: `Intended to be mainly triggered by an automated system like systemd or crontab. For each location checks if a cron backup is due and runs it.`,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
err = internal.RunCron() err = internal.RunCron()
CheckErr(err) CheckErr(err)

View File

@ -5,7 +5,6 @@ import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -14,9 +13,9 @@ var execCmd = &cobra.Command{
Short: "Execute arbitrary native restic commands for given backends", Short: "Execute arbitrary native restic commands for given backends",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, true) selected, err := internal.GetAllOrSelected(cmd, true)
CheckErr(err) CheckErr(err)

View File

@ -2,7 +2,6 @@ package cmd
import ( import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -11,9 +10,9 @@ var forgetCmd = &cobra.Command{
Short: "Forget and optionally prune snapshots according the specified policies", Short: "Forget and optionally prune snapshots according the specified policies",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, false) selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err) CheckErr(err)

View File

@ -4,7 +4,6 @@ import (
"fmt" "fmt"
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -14,9 +13,9 @@ var restoreCmd = &cobra.Command{
Args: cobra.MaximumNArgs(1), Args: cobra.MaximumNArgs(1),
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
internal.GetConfig() internal.GetConfig()
err := lock.Lock() err := internal.Lock()
CheckErr(err) CheckErr(err)
defer lock.Unlock() defer internal.Unlock()
location, _ := cmd.Flags().GetString("location") location, _ := cmd.Flags().GetString("location")
l, ok := internal.GetLocation(location) l, ok := internal.GetLocation(location)

View File

@ -8,7 +8,6 @@ import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/flags" "github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
homedir "github.com/mitchellh/go-homedir" homedir "github.com/mitchellh/go-homedir"
@ -18,7 +17,7 @@ import (
func CheckErr(err error) { func CheckErr(err error) {
if err != nil { if err != nil {
colors.Error.Fprintln(os.Stderr, "Error:", err) colors.Error.Fprintln(os.Stderr, "Error:", err)
lock.Unlock() internal.Unlock()
os.Exit(1) os.Exit(1)
} }
} }

View File

@ -9,7 +9,6 @@ import (
"github.com/cupcakearmy/autorestic/internal" "github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
@ -33,7 +32,7 @@ To check you can run "ps aux | grep autorestic".`,
} }
} }
err := lock.Unlock() err := internal.Unlock()
if err != nil { if err != nil {
colors.Error.Println("Could not unlock:", err) colors.Error.Println("Could not unlock:", err)
return return

View File

@ -10,7 +10,6 @@ import (
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/flags" "github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/joho/godotenv" "github.com/joho/godotenv"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -24,6 +23,7 @@ type Options map[string]OptionMap
type Config struct { type Config struct {
Version string `mapstructure:"version" yaml:"version"` Version string `mapstructure:"version" yaml:"version"`
Lockfile string `mapstructure:"lockfile,omitempty" yaml:"lockfile,omitempty"`
Extras interface{} `mapstructure:"extras" yaml:"extras"` Extras interface{} `mapstructure:"extras" yaml:"extras"`
Locations map[string]Location `mapstructure:"locations" yaml:"locations"` Locations map[string]Location `mapstructure:"locations" yaml:"locations"`
Backends map[string]Backend `mapstructure:"backends" yaml:"backends"` Backends map[string]Backend `mapstructure:"backends" yaml:"backends"`
@ -40,7 +40,7 @@ func exitConfig(err error, msg string) {
if msg != "" { if msg != "" {
colors.Error.Println(msg) colors.Error.Println(msg)
} }
lock.Unlock() Unlock()
os.Exit(1) os.Exit(1)
} }

View File

@ -11,7 +11,6 @@ import (
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/flags" "github.com/cupcakearmy/autorestic/internal/flags"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/cupcakearmy/autorestic/internal/metadata" "github.com/cupcakearmy/autorestic/internal/metadata"
"github.com/robfig/cron" "github.com/robfig/cron"
) )
@ -442,11 +441,11 @@ func (l Location) RunCron() error {
if err != nil { if err != nil {
return err return err
} }
last := time.Unix(lock.GetCron(l.name), 0) last := time.Unix(GetCron(l.name), 0)
next := schedule.Next(last) next := schedule.Next(last)
now := time.Now() now := time.Now()
if now.After(next) { if now.After(next) {
lock.SetCron(l.name, now.Unix()) SetCron(l.name, now.Unix())
errs := l.Backup(true, "") errs := l.Backup(true, "")
if len(errs) > 0 { if len(errs) > 0 {
return fmt.Errorf("Failed to backup location \"%s\":\n%w", l.name, errors.Join(errs...)) return fmt.Errorf("Failed to backup location \"%s\":\n%w", l.name, errors.Join(errs...))

View File

@ -1,8 +1,9 @@
package lock package internal
import ( import (
"os" "os"
"path" "path"
"path/filepath"
"sync" "sync"
"github.com/cupcakearmy/autorestic/internal/colors" "github.com/cupcakearmy/autorestic/internal/colors"
@ -12,19 +13,33 @@ import (
var lock *viper.Viper var lock *viper.Viper
var file string var file string
var once sync.Once var lockOnce sync.Once
const ( const (
RUNNING = "running" RUNNING = "running"
) )
// getLockfilePath returns the path to the lockfile. If flags.LOCKFILE_PATH is // getLockfilePath returns the path to the lockfile. The path for the lockfile
// set, its value is used, otherwise the path is generated relative to the // can be sources from multiple places If flags.LOCKFILE_PATH is set, its value
// config file. // is used; if the config has the `lockfile` option set, its value is used;
// otherwise the path is generated relative to the config file.
func getLockfilePath() string { func getLockfilePath() string {
if flags.LOCKFILE_PATH != "" { if flags.LOCKFILE_PATH != "" {
abs, err := filepath.Abs(flags.LOCKFILE_PATH)
if err != nil {
return flags.LOCKFILE_PATH return flags.LOCKFILE_PATH
} else { }
return abs
}
if lockfile := GetConfig().Lockfile; lockfile != "" {
abs, err := filepath.Abs(lockfile)
if err != nil {
return lockfile
}
return abs
}
p := viper.ConfigFileUsed() p := viper.ConfigFileUsed()
if p == "" { if p == "" {
colors.Error.Println("cannot lock before reading config location") colors.Error.Println("cannot lock before reading config location")
@ -32,11 +47,10 @@ func getLockfilePath() string {
} }
return path.Join(path.Dir(p), ".autorestic.lock.yml") return path.Join(path.Dir(p), ".autorestic.lock.yml")
} }
}
func getLock() *viper.Viper { func getLock() *viper.Viper {
if lock == nil { if lock == nil {
once.Do(func() { lockOnce.Do(func() {
lock = viper.New() lock = viper.New()
lock.SetDefault("running", false) lock.SetDefault("running", false)
file = getLockfilePath() file = getLockfilePath()

View File

@ -1,4 +1,4 @@
package lock package internal
import ( import (
"log" "log"

View File

@ -22,7 +22,7 @@ import (
"syscall" "syscall"
"github.com/cupcakearmy/autorestic/cmd" "github.com/cupcakearmy/autorestic/cmd"
"github.com/cupcakearmy/autorestic/internal/lock" "github.com/cupcakearmy/autorestic/internal"
) )
func handleCtrlC() { func handleCtrlC() {
@ -31,7 +31,7 @@ func handleCtrlC() {
go func() { go func() {
sig := <-c sig := <-c
fmt.Println("Signal:", sig) fmt.Println("Signal:", sig)
lock.Unlock() internal.Unlock()
os.Exit(0) os.Exit(0)
}() }()
} }