mirror of
https://github.com/offen/docker-volume-backup.git
synced 2026-04-29 19:55:36 +02:00
Consolidate config value resolution at top level (#705)
* Consolidate env expansion at top level * Move handling of deprecated config into resolve method * Handle template interpolation in resolve method * Clean up and document resolve function
This commit is contained in:
@@ -43,7 +43,7 @@ func runScript(c *Config) (err error) {
|
||||
}
|
||||
}()
|
||||
|
||||
unset, err := s.c.applyEnv()
|
||||
unset, warnings, err := s.c.resolve()
|
||||
if err != nil {
|
||||
return errwrap.Wrap(err, "error applying env")
|
||||
}
|
||||
@@ -52,6 +52,9 @@ func runScript(c *Config) (err error) {
|
||||
err = errors.Join(err, errwrap.Wrap(derr, "error unsetting environment variables"))
|
||||
}
|
||||
}()
|
||||
for _, w := range warnings {
|
||||
s.logger.Warn(w)
|
||||
}
|
||||
|
||||
if s.c != nil && s.c.BackupJitter > 0 {
|
||||
max := s.c.BackupJitter
|
||||
|
||||
Reference in New Issue
Block a user