Merge 51a8298f2a into f7d28b486c

cmd/backup.go

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

cmd/check.go

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

cmd/cron.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/cupcakearmy/autorestic/internal"
 	"github.com/cupcakearmy/autorestic/internal/flags"
+	"github.com/cupcakearmy/autorestic/internal/lock"
 	"github.com/spf13/cobra"
 )
 
@@ -12,9 +13,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.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		internal.GetConfig()
-		err := internal.Lock()
+		err := lock.Lock()
 		CheckErr(err)
-		defer internal.Unlock()
+		defer lock.Unlock()
 
 		err = internal.RunCron()
 		CheckErr(err)

cmd/exec.go

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

cmd/forget.go

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

cmd/restore.go

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

cmd/root.go

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

cmd/unlock.go

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

internal/config.go

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

internal/location.go

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

internal/lock/lock.go

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

internal/lock/lock_test.go

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

main.go

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