cupcakearmy/autorestic
1
0
Fork 0
mirror of https://github.com/cupcakearmy/autorestic.git synced 2024-12-22 08:16:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: move lockfile code to internal module

Browse Source 
In a future commit, I'll need the lockfile code to access the config
file. This solves an import cycle.
This commit is contained in:
Boris Bera 2024-11-10 13:37:59 -05:00
parent ccca7c850f
commit 8de8d0070e
No known key found for this signature in database
GPG Key ID: 97AF3BB8EEBDF180
13 changed files with 23 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/backup.go
View File

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

5
cmd/check.go
View File

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

5
cmd/cron.go
View File

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

5
cmd/exec.go
View File

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

5
cmd/forget.go
View File

@ -2,7 +2,6 @@ package cmd
import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/lock"
"github.com/spf13/cobra"
)
@ -11,9 +10,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 := lock.Lock()
err := internal.Lock()
CheckErr(err)
defer lock.Unlock()
defer internal.Unlock()
selected, err := internal.GetAllOrSelected(cmd, false)
CheckErr(err)

5
cmd/restore.go
View File

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

3
cmd/root.go
View File

@ -8,7 +8,6 @@ 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"
@ -18,7 +17,7 @@ import (
func CheckErr(err error) {
if err != nil {
colors.Error.Fprintln(os.Stderr, "Error:", err)
lock.Unlock()
internal.Unlock()
os.Exit(1)
}
}

3
cmd/unlock.go
View File

@ -9,7 +9,6 @@ import (
"github.com/cupcakearmy/autorestic/internal"
"github.com/cupcakearmy/autorestic/internal/colors"
"github.com/cupcakearmy/autorestic/internal/lock"
"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 {
colors.Error.Println("Could not unlock:", err)
return

3
internal/config.go
View File

@ -10,7 +10,6 @@ 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"
@ -40,7 +39,7 @@ func exitConfig(err error, msg string) {
if msg != "" {
colors.Error.Println(msg)
}
lock.Unlock()
Unlock()
os.Exit(1)
}

5
internal/location.go
View File

@ -11,7 +11,6 @@ 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"
)
@ -442,11 +441,11 @@ func (l Location) RunCron() error {
if err != nil {
return err
}
last := time.Unix(lock.GetCron(l.name), 0)
last := time.Unix(GetCron(l.name), 0)
next := schedule.Next(last)
now := time.Now()
if now.After(next) {
lock.SetCron(l.name, now.Unix())
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...))

6
internal/lock/lock.go → internal/lock.go
View File

@ -1,4 +1,4 @@
package lock
package internal
import (
"os"
@ -12,7 +12,7 @@ import (
var lock *viper.Viper
var file string
var once sync.Once
var lockOnce sync.Once
const (
RUNNING = "running"
@ -36,7 +36,7 @@ func getLockfilePath() string {
func getLock() *viper.Viper {
if lock == nil {
once.Do(func() {
lockOnce.Do(func() {
lock = viper.New()
lock.SetDefault("running", false)
file = getLockfilePath()

2
internal/lock/lock_test.go → internal/lock_test.go
View File

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

4
main.go
View File

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