mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-29 10:28:53 +03:00
30c6676dc0
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master Squashed commit of the following: commit 925b35b9fedcdcf18474785530189a1eb504e1d6 Merge: 232f18481581891af2Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Sep 6 12:48:05 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit 232f18481bbf3400da0b95bcec7949fb3868bf85 Merge: c0d880bed5bd452516Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 18:54:47 2023 +0300 Merge branch 'master' into AG-25392-confmigrate-vol.3 commit c0d880bed6e3270e88f5377e66b787565e1249ce Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 17:21:57 2023 +0300 confmigrate: fix v15 commit 8a27148b708e6d6a61f8097bf7792aefa1055772 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Sep 5 15:47:18 2023 +0300 confmigrate: imp gocognit, overall
78 lines
1.3 KiB
Go
78 lines
1.3 KiB
Go
package confmigrate
|
|
|
|
// migrateTo16 performs the following changes:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 15
|
|
// 'dns':
|
|
// # …
|
|
// 'statistics_interval': 1
|
|
// 'statistics':
|
|
// # …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 16
|
|
// 'dns':
|
|
// # …
|
|
// 'statistics':
|
|
// 'enabled': true
|
|
// 'interval': 1
|
|
// 'ignored': []
|
|
// # …
|
|
// # …
|
|
//
|
|
// If statistics were disabled:
|
|
//
|
|
// # BEFORE:
|
|
// 'schema_version': 15
|
|
// 'dns':
|
|
// # …
|
|
// 'statistics_interval': 0
|
|
// 'statistics':
|
|
// # …
|
|
// # …
|
|
//
|
|
// # AFTER:
|
|
// 'schema_version': 16
|
|
// 'dns':
|
|
// # …
|
|
// 'statistics':
|
|
// 'enabled': false
|
|
// 'interval': 1
|
|
// 'ignored': []
|
|
// # …
|
|
// # …
|
|
func migrateTo16(diskConf yobj) (err error) {
|
|
diskConf["schema_version"] = 16
|
|
|
|
dns, ok, err := fieldVal[yobj](diskConf, "dns")
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
stats := yobj{
|
|
"enabled": true,
|
|
"interval": 1,
|
|
"ignored": yarr{},
|
|
}
|
|
diskConf["statistics"] = stats
|
|
|
|
const field = "statistics_interval"
|
|
|
|
statsIvl, ok, err := fieldVal[int](dns, field)
|
|
if !ok {
|
|
return err
|
|
}
|
|
|
|
if statsIvl == 0 {
|
|
// Set the interval to the default value of one day to make sure
|
|
// that it passes the validations.
|
|
stats["enabled"] = false
|
|
} else {
|
|
stats["interval"] = statsIvl
|
|
}
|
|
delete(dns, field)
|
|
|
|
return nil
|
|
}
|