Skip to content

policies: before is now a duration #2105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omar-polo wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

policies: before is now a duration #2105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions scheduler/tasks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"fmt"
"time"

"github.com/PlakarKorp/kloset/connectors/storage"
"github.com/PlakarKorp/kloset/encryption"
"github.com/PlakarKorp/kloset/locate"
"github.com/PlakarKorp/kloset/repository"
"github.com/PlakarKorp/kloset/connectors/storage"
"github.com/PlakarKorp/kloset/versioning"
"github.com/PlakarKorp/plakar/cached"
"github.com/PlakarKorp/plakar/subcommands/backup"
Expand Down Expand Up @@ -92,7 +92,7 @@ func (s *Scheduler) backupTask(taskset Task, task BackupConfig) {
continue
}

rmSubcommand.LocateOptions.Filters.Before = time.Now().Add(-task.Retention)
rmSubcommand.LocateOptions.Filters.Before = task.Retention
retval, err := ptask.RunCommand(s.ctx, rmSubcommand, repo, "@scheduler")
if err != nil || retval != 0 {
s.ctx.GetLogger().Error("Error removing obsolete backups: %s", err)
Expand Down Expand Up @@ -285,7 +285,7 @@ func (s *Scheduler) maintenanceTask(task MaintenanceConfig) {
continue
}

rmSubcommand.LocateOptions.Filters.Before = time.Now().Add(-task.Retention)
rmSubcommand.LocateOptions.Filters.Before = task.Retention
retval, err := ptask.RunCommand(s.ctx, rmSubcommand, repo, "@scheduler")
if err != nil || retval != 0 {
s.ctx.GetLogger().Error("Error removing obsolete backups: %s", err)
Expand Down
11 changes: 11 additions & 0 deletions utils/config_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
return nil
}

func (c *policiesConfig) setDuration(value string, p *time.Duration) error {
t, err := locate.ParseDurationFlag(value)

Check failure on line 53 in utils/config_policy.go

View workflow job for this annotation

GitHub Actions / build 

undefined: locate.ParseDurationFlag

Check failure on line 53 in utils/config_policy.go

View workflow job for this annotation

GitHub Actions / build 

undefined: locate.ParseDurationFlag
if err != nil {
return fmt.Errorf("invalid value: %w", err)
}
*p = t
return nil
}

func (c *policiesConfig) setStringList(value string, p *[]string) error {
*p = strings.Split(value, ",")
return nil
Expand Down Expand Up @@ -154,6 +163,8 @@
return c.setInt(value, p)
case *time.Time:
return c.setTime(value, p)
case *time.Duration:
return c.setDuration(value, p)
case *string:
*p = value
return nil
Expand Down
Loading