daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request 1995: AG-25392 confmigrate vol.3

Browse Source 
Merge in DNS/adguard-home from AG-25392-confmigrate-vol.3 to master

Squashed commit of the following:

commit 925b35b9fedcdcf18474785530189a1eb504e1d6
Merge: 232f18481 581891af2
Author: 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: c0d880bed 5bd452516
Author: 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
This commit is contained in:
Eugene Burkov
2023-09-06 13:43:29 +03:00
parent 581891af22
commit 30c6676dc0
25 changed files with 124 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/confmigrate/v7.go
View File

@@ -28,11 +28,11 @@ package confmigrate
// 'lease_duration': 86400
// 'icmp_timeout_msec': 1000
// # …
func migrateTo7(diskConf yobj) error {
func migrateTo7(diskConf yobj) (err error) {
diskConf["schema_version"] = 7
dhcp, ok, err := fieldVal[yobj](diskConf, "dhcp")
if err != nil || !ok {
dhcp, ok, _ := fieldVal[yobj](diskConf, "dhcp")
if !ok {
return nil
}