code_before
stringlengths 16
1.81M
| edits
stringlengths 4
328k
| next_edit
stringlengths 0
76.5k
| code_after
stringlengths 3
49.9M
| label_window
sequencelengths 4
1.81k
| instruction
stringlengths 20
51.9k
| html_url
stringlengths 74
116
| file_name
stringlengths 3
311
|
|---|---|---|---|---|---|---|---|
}
ipsetNames := strings.Split(hostsAndNames[1], ",")
if len(ipsetNames) == 0 {
log.Debug("IPSET: invalid value '%s'", it)
continue
}
bad := false
for i := range ipsetNames {
ipsetNames[i] = strings.TrimSpace(ipsetNames[i])
| </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("DHCPv4: bad option string: %s", o)
</s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("skipping unknown blocked-service '%s'", s)
</s> add log.Debug("skipping unknown blocked-service %q", s) | log.Debug("IPSET: invalid value %q", it) | }
ipsetNames := strings.Split(hostsAndNames[1], ",")
if len(ipsetNames) == 0 {
log.Debug("IPSET: invalid value %q", it)
continue
}
bad := false
for i := range ipsetNames {
ipsetNames[i] = strings.TrimSpace(ipsetNames[i]) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
break
}
}
if bad {
log.Debug("IPSET: invalid value '%s'", it)
continue
}
hosts := strings.Split(hostsAndNames[0], ",")
for _, host := range hosts {
| </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("DHCPv4: bad option string: %s", o)
</s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s)
</s> add log.Debug("Clients: skipping unknown blocked-service %q", s) | log.Debug("IPSET: invalid value %q", it) | break
}
}
if bad {
log.Debug("IPSET: invalid value %q", it)
continue
}
hosts := strings.Split(hostsAndNames[0], ",")
for _, host := range hosts { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
for _, host := range hosts {
host = strings.TrimSpace(host)
host = strings.ToLower(host)
if len(host) == 0 {
log.Debug("IPSET: invalid value '%s'", it)
continue
}
c.ipsetList[host] = ipsetNames
}
}
| </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove return nil, errorx.Decorate(err, "dnsfilter failed to check host '%s'", host)
</s> add return nil, fmt.Errorf("dnsfilter failed to check host %q: %w", host, err) </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", | log.Debug("IPSET: invalid value %q", it) | for _, host := range hosts {
host = strings.TrimSpace(host)
host = strings.ToLower(host)
if len(host) == 0 {
log.Debug("IPSET: invalid value %q", it)
continue
}
c.ipsetList[host] = ipsetNames
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err)
continue
}
if code != 0 {
log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
continue
}
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
}
}
| </s> remove log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
</s> add log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) </s> remove log.Debug("DHCPv4: bad option string: %s", o)
</s> add log.Debug("dhcpv4: bad option string: %s", o) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err)
</s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) | log.Info("IPSET: ipset add: code:%d output:%q", code, out) | log.Info("IPSET: %s(%s) -> %s: %s", host, ipStr, name, err)
continue
}
if code != 0 {
log.Info("IPSET: ipset add: code:%d output:%q", code, out)
continue
}
log.Debug("IPSET: added %s(%s) -> %s", host, ipStr, name)
}
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/ipset.go |
}
err := s.dnsProxy.Resolve(newContext)
if err != nil {
log.Printf("Couldn't look up replacement host '%s': %s", newAddr, err)
return s.genServerFailure(request)
}
resp := s.makeResponse(request)
if newContext.Res != nil {
| </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) | log.Printf("Couldn't look up replacement host %q: %s", newAddr, err) | }
err := s.dnsProxy.Resolve(newContext)
if err != nil {
log.Printf("Couldn't look up replacement host %q: %s", newAddr, err)
return s.genServerFailure(request)
}
resp := s.makeResponse(request)
if newContext.Res != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/dnsforward/msg.go |
"go.etcd.io/bbolt"
"golang.org/x/crypto/bcrypt"
)
const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
type session struct {
userName string
expire uint32 // expiration time (in seconds)
}
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
</s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
const resolvedConfData = `[Resolve]
</s> add const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve] </s> remove
"github.com/joomcode/errorx"
</s> add | const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) | "go.etcd.io/bbolt"
"golang.org/x/crypto/bcrypt"
)
const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
)
const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
)
type session struct {
userName string
expire uint32 // expiration time (in seconds)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
a.sessionTTL = sessionTTL
a.sessions = make(map[string]*session)
rand.Seed(time.Now().UTC().Unix())
var err error
a.db, err = bbolt.Open(dbFilename, 0644, nil)
if err != nil {
log.Error("Auth: open DB: %s: %s", dbFilename, err)
if err.Error() == "invalid argument" {
log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations")
}
| </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %w", err) | a.db, err = bbolt.Open(dbFilename, 0o644, nil) | a.sessionTTL = sessionTTL
a.sessions = make(map[string]*session)
rand.Seed(time.Now().UTC().Unix())
var err error
a.db, err = bbolt.Open(dbFilename, 0o644, nil)
if err != nil {
log.Error("Auth: open DB: %s: %s", dbFilename, err)
if err.Error() == "invalid argument" {
log.Error("AdGuard Home cannot be initialized due to an incompatible file system.\nPlease read the explanation here: https://github.com/AdguardTeam/AdGuardHome/internal/wiki/Getting-Started#limitations")
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
}
cookie := Context.auth.httpCookie(req)
if len(cookie) == 0 {
log.Info("Auth: invalid user name or password: name='%s'", req.Name)
time.Sleep(1 * time.Second)
http.Error(w, "invalid user name or password", http.StatusBadRequest)
return
}
| </s> remove return fmt.Errorf("DHCPv4: Couldn't find interface by name %s: %s", s.conf.InterfaceName, err)
</s> add return fmt.Errorf("dhcpv4: Couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return wrapErrPrint(err, "Couldn't find interface by name %s", s.conf.InterfaceName)
</s> add return fmt.Errorf("couldn't find interface by name %s: %w", s.conf.InterfaceName, err) </s> remove return s, fmt.Errorf("DHCPv6: invalid range-start IP: %s", conf.RangeStart)
</s> add return s, fmt.Errorf("dhcpv6: invalid range-start IP: %s", conf.RangeStart) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) | log.Info("Auth: invalid user name or password: name=%q", req.Name) | }
cookie := Context.auth.httpCookie(req)
if len(cookie) == 0 {
log.Info("Auth: invalid user name or password: name=%q", req.Name)
time.Sleep(1 * time.Second)
http.Error(w, "invalid user name or password", http.StatusBadRequest)
return
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/auth.go |
}
for _, s := range cy.BlockedServices {
if !dnsfilter.BlockedSvcKnown(s) {
log.Debug("Clients: skipping unknown blocked-service '%s'", s)
continue
}
cli.BlockedServices = append(cli.BlockedServices, s)
}
| </s> remove log.Debug("skipping unknown blocked-service '%s'", s)
</s> add log.Debug("skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown tag '%s'", t)
</s> add log.Debug("Clients: skipping unknown tag %q", t) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | log.Debug("Clients: skipping unknown blocked-service %q", s) | }
for _, s := range cy.BlockedServices {
if !dnsfilter.BlockedSvcKnown(s) {
log.Debug("Clients: skipping unknown blocked-service %q", s)
continue
}
cli.BlockedServices = append(cli.BlockedServices, s)
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
}
for _, t := range cy.Tags {
if !clients.tagKnown(t) {
log.Debug("Clients: skipping unknown tag '%s'", t)
continue
}
cli.Tags = append(cli.Tags, t)
}
sort.Strings(cli.Tags)
| </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s)
</s> add log.Debug("Clients: skipping unknown blocked-service %q", s) </s> remove log.Debug("skipping unknown blocked-service '%s'", s)
</s> add log.Debug("skipping unknown blocked-service %q", s) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | log.Debug("Clients: skipping unknown tag %q", t) | }
for _, t := range cy.Tags {
if !clients.tagKnown(t) {
log.Debug("Clients: skipping unknown tag %q", t)
continue
}
cli.Tags = append(cli.Tags, t)
}
sort.Strings(cli.Tags) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
return fmt.Errorf("invalid Name")
}
if len(c.IDs) == 0 {
return fmt.Errorf("ID required")
}
for i, id := range c.IDs {
ip := net.ParseIP(id)
if ip != nil {
| </s> remove return fmt.Errorf("invalid upstream servers: %s", err)
</s> add return fmt.Errorf("invalid upstream servers: %w", err) </s> remove log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
</s> add log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: invalid range start IP")
</s> add return s, fmt.Errorf("dhcpv4: invalid range start IP") | return fmt.Errorf("id required") | return fmt.Errorf("invalid Name")
}
if len(c.IDs) == 0 {
return fmt.Errorf("id required")
}
for i, id := range c.IDs {
ip := net.ParseIP(id)
if ip != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
sort.Strings(c.Tags)
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %s", err)
}
return nil
}
| </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: SetHopLimit: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: SetHopLimit: %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) | return fmt.Errorf("invalid upstream servers: %w", err) | sort.Strings(c.Tags)
err := dnsforward.ValidateUpstreams(c.Upstreams)
if err != nil {
return fmt.Errorf("invalid upstream servers: %w", err)
}
return nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
for _, id := range c.IDs {
clients.idIndex[id] = &c
}
log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
return true, nil
}
// Del removes a client
func (clients *clientsContainer) Del(name string) bool {
| </s> remove log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
</s> add log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) </s> remove return fmt.Errorf("ID required")
</s> add return fmt.Errorf("id required") </s> remove log.Debug("Clients: skipping unknown blocked-service '%s'", s)
</s> add log.Debug("Clients: skipping unknown blocked-service %q", s) </s> remove log.Debug("Clients: skipping unknown tag '%s'", t)
</s> add log.Debug("Clients: skipping unknown tag %q", t) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) | log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) | for _, id := range c.IDs {
clients.idIndex[id] = &c
}
log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list))
return true, nil
}
// Del removes a client
func (clients *clientsContainer) Del(name string) bool { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
Source: source,
}
clients.ipHost[ip] = ch
}
log.Debug("Clients: added '%s' -> '%s' [%d]", ip, host, len(clients.ipHost))
return true, nil
}
// Remove all entries that match the specified source
func (clients *clientsContainer) rmHosts(source clientSource) int {
| </s> remove log.Debug("Clients: added '%s': ID:%v [%d]", c.Name, c.IDs, len(clients.list))
</s> add log.Debug("Clients: added %q: ID:%v [%d]", c.Name, c.IDs, len(clients.list)) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove log.Info("IPSET: ipset add: code:%d output:'%s'", code, out)
</s> add log.Info("IPSET: ipset add: code:%d output:%q", code, out) </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", </s> remove log.Debug("Filtering: found rule for host '%s': '%s' list_id: %d",
</s> add log.Debug("Filtering: found rule for host %q: %q list_id: %d", | log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost)) | Source: source,
}
clients.ipHost[ip] = ch
}
log.Debug("Clients: added %q -> %q [%d]", ip, host, len(clients.ipHost))
return true, nil
}
// Remove all entries that match the specified source
func (clients *clientsContainer) rmHosts(source clientSource) int { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/clients.go |
return true
}
const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
const resolvedConfData = `[Resolve]
DNS=127.0.0.1
DNSStubListener=no
`
const resolvConfPath = "/etc/resolv.conf"
| </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove "github.com/joomcode/errorx"
</s> add </s> remove log.Debug("DHCPv6 RA: loop exit")
</s> add log.Debug("dhcpv6 ra: loop exit") </s> remove log.Debug("DHCPv4: No lease for %s", mac)
</s> add log.Debug("dhcpv4: No lease for %s", mac) | const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve] |
return true
}
const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve]
const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve]
DNS=127.0.0.1
DNSStubListener=no
`
const resolvConfPath = "/etc/resolv.conf"
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
DNS=127.0.0.1
DNSStubListener=no
`
const resolvConfPath = "/etc/resolv.conf"
// Deactivate DNSStubListener
func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath)
| </s> remove const resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
const resolvedConfData = `[Resolve]
</s> add const (
resolvedConfPath = "/etc/systemd/resolved.conf.d/adguardhome.conf"
resolvedConfData = `[Resolve] </s> remove err := os.MkdirAll(dir, 0755)
</s> add err := os.MkdirAll(dir, 0o755) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove log.Debug("DHCPv4: added lease %s <-> %s", l.IP, l.HWAddr)
</s> add log.Debug("dhcpv4: added lease %s <-> %s", l.IP, l.HWAddr) | ) | DNS=127.0.0.1
DNSStubListener=no
`
)
const resolvConfPath = "/etc/resolv.conf"
// Deactivate DNSStubListener
func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
// Deactivate DNSStubListener
func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath)
err := os.MkdirAll(dir, 0755)
if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
| </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755)
</s> add err := os.MkdirAll(Context.getDataDir(), 0o755) | err := os.MkdirAll(dir, 0o755) |
// Deactivate DNSStubListener
func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath)
err := os.MkdirAll(dir, 0o755)
if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath)
err := os.MkdirAll(dir, 0755)
if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
| </s> remove err := os.MkdirAll(dir, 0755)
</s> add err := os.MkdirAll(dir, 0o755) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755)
</s> add err := os.MkdirAll(Context.getDataDir(), 0o755) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) | return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) | func disableDNSStubListener() error {
dir := filepath.Dir(resolvedConfPath)
err := os.MkdirAll(dir, 0755)
if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %w", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
}
_ = os.Rename(resolvConfPath, resolvConfPath+".backup")
| </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err := os.MkdirAll(dir, 0755)
</s> add err := os.MkdirAll(dir, 0o755) </s> remove return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err)
</s> add return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) | err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) | if err != nil {
return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
}
_ = os.Rename(resolvConfPath, resolvConfPath+".backup") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
}
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
}
_ = os.Rename(resolvConfPath, resolvConfPath+".backup")
err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath)
if err != nil {
| </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err)
</s> add return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) </s> remove err := os.MkdirAll(dir, 0755)
</s> add err := os.MkdirAll(dir, 0o755) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) | return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) | }
err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err)
}
_ = os.Rename(resolvConfPath, resolvConfPath+".backup")
err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
_ = os.Rename(resolvConfPath, resolvConfPath+".backup")
err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath)
if err != nil {
_ = os.Remove(resolvedConfPath) // remove the file we've just created
return fmt.Errorf("os.Symlink: %s: %s", resolvConfPath, err)
}
cmd := exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output()
| </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) | return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err) | _ = os.Rename(resolvConfPath, resolvConfPath+".backup")
err = os.Symlink("/run/systemd/resolve/resolv.conf", resolvConfPath)
if err != nil {
_ = os.Remove(resolvedConfPath) // remove the file we've just created
return fmt.Errorf("os.Symlink: %s: %w", resolvConfPath, err)
}
cmd := exec.Command("systemctl", "reload-or-restart", "systemd-resolved")
log.Tracef("executing %s %v", cmd.Path, cmd.Args)
_, err = cmd.Output() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/control_install.go |
"github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
)
// Called by other modules when configuration is changed
func onConfigModified() {
_ = config.write()
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | "github.com/AdguardTeam/AdGuardHome/internal/stats"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/dnsproxy/proxy"
"github.com/AdguardTeam/golibs/log"
)
// Called by other modules when configuration is changed
func onConfigModified() {
_ = config.write() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
|
dnsConfig := generateServerConfig()
err = Context.dnsServer.Prepare(&dnsConfig)
if err != nil {
closeDNSServer()
return fmt.Errorf("dnsServer.Prepare: %s", err)
}
Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
Context.whois = initWhois(&Context.clients)
| </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) | return fmt.Errorf("dnsServer.Prepare: %w", err) | dnsConfig := generateServerConfig()
err = Context.dnsServer.Prepare(&dnsConfig)
if err != nil {
closeDNSServer()
return fmt.Errorf("dnsServer.Prepare: %w", err)
}
Context.rdns = InitRDNS(Context.dnsServer, &Context.clients)
Context.whois = initWhois(&Context.clients)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false //software
case 10:
return false //private network
case 127:
return false //loopback
case 169:
| </s> remove return false //private network
</s> add return false // private network </s> remove return false //loopback
</s> add return false // loopback </s> remove return false //link-local
</s> add return false // link-local </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | return false // software | ip4 := ip.To4()
if ip4 != nil {
switch ip4[0] {
case 0:
return false // software
case 10:
return false //private network
case 127:
return false //loopback
case 169: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
switch ip4[0] {
case 0:
return false //software
case 10:
return false //private network
case 127:
return false //loopback
case 169:
if ip4[1] == 254 {
return false //link-local
| </s> remove return false //loopback
</s> add return false // loopback </s> remove return false //software
</s> add return false // software </s> remove return false //link-local
</s> add return false // link-local </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | return false // private network | switch ip4[0] {
case 0:
return false //software
case 10:
return false // private network
case 127:
return false //loopback
case 169:
if ip4[1] == 254 {
return false //link-local | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false //software
case 10:
return false //private network
case 127:
return false //loopback
case 169:
if ip4[1] == 254 {
return false //link-local
}
case 172:
| </s> remove return false //private network
</s> add return false // private network </s> remove return false //link-local
</s> add return false // link-local </s> remove return false //software
</s> add return false // software </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | return false // loopback | return false //software
case 10:
return false //private network
case 127:
return false // loopback
case 169:
if ip4[1] == 254 {
return false //link-local
}
case 172: | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
case 127:
return false //loopback
case 169:
if ip4[1] == 254 {
return false //link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false //private network
}
| </s> remove return false //loopback
</s> add return false // loopback </s> remove return false //private network
</s> add return false // private network </s> remove return false //private network
</s> add return false // private network </s> remove return false //software
</s> add return false // software </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast | return false // link-local | case 127:
return false //loopback
case 169:
if ip4[1] == 254 {
return false // link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false //private network
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
return false //link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false //private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
| </s> remove if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
</s> add if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation
</s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //link-local
</s> add return false // link-local </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast | return false // private network | return false //link-local
}
case 172:
if ip4[1] >= 16 && ip4[1] <= 31 {
return false // private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] >= 16 && ip4[1] <= 31 {
return false //private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
| </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation
</s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
</s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast | if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network | if ip4[1] >= 16 && ip4[1] <= 31 {
return false //private network
}
case 192:
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
(ip4[1] == 168) { //private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { //documentation
return false
| </s> remove if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
</s> add if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network </s> remove return false //private network
</s> add return false // private network </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation
</s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
</s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet | if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | (ip4[1] == 168) { //private network
return false
}
case 198:
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { //documentation
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
(ip4[1] == 51 || ip4[2] == 100) { //documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { //documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { //multicast
return false
| </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
</s> add if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network </s> remove return false //private network
</s> add return false // private network </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
</s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet | if ip4[1] == 0 && ip4[2] == 113 { // documentation | (ip4[1] == 51 || ip4[2] == 100) { //documentation
return false
}
case 203:
if ip4[1] == 0 && ip4[2] == 113 { // documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { //multicast
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] == 0 && ip4[2] == 113 { //documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { //multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
return false
| </s> remove if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
</s> add if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation
</s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
</s> add if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | if ip4[1] == 0 && ip4[2] == 0 { // multicast | if ip4[1] == 0 && ip4[2] == 113 { //documentation
return false
}
case 224:
if ip4[1] == 0 && ip4[2] == 0 { // multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
return false | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
if ip4[1] == 0 && ip4[2] == 0 { //multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { //subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() {
| </s> remove if ip4[1] == 0 && ip4[2] == 0 { //multicast
</s> add if ip4[1] == 0 && ip4[2] == 0 { // multicast </s> remove if ip4[1] == 0 && ip4[2] == 113 { //documentation
</s> add if ip4[1] == 0 && ip4[2] == 113 { // documentation </s> remove return false //private network
</s> add return false // private network </s> remove if (ip4[1] == 0 && ip4[2] == 0) || //private network
(ip4[1] == 0 && ip4[2] == 2) || //documentation
(ip4[1] == 88 && ip4[2] == 99) || //reserved
(ip4[1] == 168) { //private network
</s> add if (ip4[1] == 0 && ip4[2] == 0) || // private network
(ip4[1] == 0 && ip4[2] == 2) || // documentation
(ip4[1] == 88 && ip4[2] == 99) || // reserved
(ip4[1] == 168) { // private network </s> remove if (ip4[1] == 18 || ip4[2] == 19) || //private network
(ip4[1] == 51 || ip4[2] == 100) { //documentation
</s> add if (ip4[1] == 18 || ip4[2] == 19) || // private network
(ip4[1] == 51 || ip4[2] == 100) { // documentation | if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet | if ip4[1] == 0 && ip4[2] == 0 { //multicast
return false
}
case 255:
if ip4[1] == 255 && ip4[2] == 255 && ip4[3] == 255 { // subnet
return false
}
}
} else {
if ip.IsLoopback() || ip.IsLinkLocalMulticast() || ip.IsLinkLocalUnicast() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
Context.clients.Start()
err := Context.dnsServer.Start()
if err != nil {
return errorx.Decorate(err, "Couldn't start forwarding DNS server")
}
Context.dnsFilter.Start()
Context.filters.Start()
Context.stats.Start()
| </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) | return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | Context.clients.Start()
err := Context.dnsServer.Start()
if err != nil {
return fmt.Errorf("couldn't start forwarding DNS server: %w", err)
}
Context.dnsFilter.Start()
Context.filters.Start()
Context.stats.Start() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
func reconfigureDNSServer() error {
newconfig := generateServerConfig()
err := Context.dnsServer.Reconfigure(&newconfig)
if err != nil {
return errorx.Decorate(err, "Couldn't start forwarding DNS server")
}
return nil
}
| </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) | return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | func reconfigureDNSServer() error {
newconfig := generateServerConfig()
err := Context.dnsServer.Reconfigure(&newconfig)
if err != nil {
return fmt.Errorf("couldn't start forwarding DNS server: %w", err)
}
return nil
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
}
err := Context.dnsServer.Stop()
if err != nil {
return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
}
closeDNSServer()
return nil
}
| </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) </s> remove return errorx.Decorate(err, "could not stop the DNS server properly")
</s> add return fmt.Errorf("could not stop the DNS server properly: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) </s> remove return errorx.Decorate(err, "could not reconfigure the server")
</s> add return fmt.Errorf("could not reconfigure the server: %w", err) | return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) | }
err := Context.dnsServer.Stop()
if err != nil {
return fmt.Errorf("couldn't stop forwarding DNS server: %w", err)
}
closeDNSServer()
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/dns.go |
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/golibs/log"
)
var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
// Filtering - module object
type Filtering struct {
// conf FilteringConf
refreshStatus uint32 // 0:none; 1:in progress
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove "github.com/joomcode/errorx"
</s> add </s> remove
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID | "github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/golibs/log"
)
var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
// Filtering - module object
type Filtering struct {
// conf FilteringConf
refreshStatus uint32 // 0:none; 1:in progress | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
// Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters)
deduplicateFilters()
updateUniqueFilterID(config.Filters)
updateUniqueFilterID(config.WhitelistFilters)
| </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove "github.com/joomcode/errorx"
</s> add </s> remove log.Debug("DHCPv6 RA: closing")
</s> add log.Debug("dhcpv6 ra: closing") </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) | _ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0o755) |
// Init - initialize the module
func (f *Filtering) Init() {
f.filterTitleRegexp = regexp.MustCompile(`^! Title: +(.*)$`)
_ = os.MkdirAll(filepath.Join(Context.getDataDir(), filterDir), 0o755)
f.loadFilters(config.Filters)
f.loadFilters(config.WhitelistFilters)
deduplicateFilters()
updateUniqueFilterID(config.Filters)
updateUniqueFilterID(config.WhitelistFilters) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %s", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL)
| </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove log.Debug("DHCPv4: dhcpv4.New: %s", err)
</s> add log.Debug("dhcpv4: dhcpv4.New: %s", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) | return false, fmt.Errorf("open file: %w", err) | var reader io.Reader
if filepath.IsAbs(filter.URL) {
f, err := os.Open(filter.URL)
if err != nil {
return false, fmt.Errorf("open file: %w", err)
}
defer f.Close()
reader = f
} else {
resp, err := Context.client.Get(filter.URL) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/filter.go |
"time"
"gopkg.in/natefinch/lumberjack.v2"
"github.com/AdguardTeam/AdGuardHome/internal/update"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/isdelve"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | "github.com/AdguardTeam/AdGuardHome/internal/agherr" | "time"
"gopkg.in/natefinch/lumberjack.v2"
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
"github.com/AdguardTeam/AdGuardHome/internal/update"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/isdelve"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
"github.com/AdguardTeam/AdGuardHome/internal/update"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/joomcode/errorx"
"github.com/AdguardTeam/AdGuardHome/internal/isdelve"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward"
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add |
"github.com/AdguardTeam/AdGuardHome/internal/update"
"github.com/AdguardTeam/AdGuardHome/internal/util"
"github.com/AdguardTeam/AdGuardHome/internal/isdelve"
"github.com/AdguardTeam/AdGuardHome/internal/dhcpd"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/internal/dnsforward" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
|
signal.Notify(Context.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
go func() {
for {
sig := <-Context.appSignalChannel
log.Info("Received signal '%s'", sig)
switch sig {
case syscall.SIGHUP:
Context.clients.Reload()
Context.tls.Reload()
| </s> remove return false //software
</s> add return false // software </s> remove log.Info("DHCPv4: listening")
</s> add log.Info("dhcpv4: listening") </s> remove return false //private network
</s> add return false // private network </s> remove log.Debug("DHCPv6 RA: starting to send periodic RouterAdvertisement packets")
</s> add log.Debug("dhcpv6 ra: starting to send periodic RouterAdvertisement packets") </s> remove log.Debug("DHCPv4: srv.Serve: %s", err)
</s> add log.Debug("dhcpv4: srv.Serve: %s", err) | log.Info("Received signal %q", sig) | signal.Notify(Context.appSignalChannel, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT)
go func() {
for {
sig := <-Context.appSignalChannel
log.Info("Received signal %q", sig)
switch sig {
case syscall.SIGHUP:
Context.clients.Reload()
Context.tls.Reload()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
}()
}
}
err := os.MkdirAll(Context.getDataDir(), 0755)
if err != nil {
log.Fatalf("Cannot create DNS data dir at %s: %s", Context.getDataDir(), err)
}
sessFilename := filepath.Join(Context.getDataDir(), "sessions.db")
| </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err := os.MkdirAll(dir, 0755)
</s> add err := os.MkdirAll(dir, 0o755) </s> remove _, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
</s> add _, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644) </s> remove return errorx.Decorate(err, "Couldn't stop forwarding DNS server")
</s> add return fmt.Errorf("couldn't stop forwarding DNS server: %w", err) </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) | err := os.MkdirAll(Context.getDataDir(), 0o755) | }()
}
}
err := os.MkdirAll(Context.getDataDir(), 0o755)
if err != nil {
log.Fatalf("Cannot create DNS data dir at %s: %s", Context.getDataDir(), err)
}
sessFilename := filepath.Join(Context.getDataDir(), "sessions.db") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
if runtime.GOOS == "windows" {
// On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if //noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
}
| </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return fmt.Errorf("invalid bootstrap server address: %s", err)
</s> add return fmt.Errorf("invalid bootstrap server address: %w", err) </s> remove return false, wrapErrPrint(err, "Couldn't send a packet to %s", dst)
</s> add return false, fmt.Errorf("couldn't send a packet to %s: %w", dst, err) </s> remove return false, wrapErrPrint(err, "Couldn't listen on :68")
</s> add return false, fmt.Errorf("couldn't listen on :68: %w", err) | if // noinspection ALL | if runtime.GOOS == "windows" {
// On Windows we need to have admin rights to run properly
admin, _ := util.HaveAdminRights()
if // noinspection ALL
admin || isdelve.Enabled {
// Don't forget that for this to work you need to add "delve" tag explicitly
// https://stackoverflow.com/questions/47879070/how-can-i-see-if-the-goland-debugger-is-running-in-the-program
return
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
// Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true
| </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key")
</s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("ioutil.ReadFile(): %s: %w", f.FilePath, err) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) | err := ioutil.WriteFile(fn, []byte(data), 0o644) |
// Write PID to a file
func writePIDFile(fn string) bool {
data := fmt.Sprintf("%d", os.Getpid())
err := ioutil.WriteFile(fn, []byte(data), 0o644)
if err != nil {
log.Error("Couldn't write PID to file %s: %v", fn, err)
return false
}
return true | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
if filepath.IsAbs(ls.LogFile) {
logFilePath = ls.LogFile
}
_, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0644)
if err != nil {
log.Fatalf("cannot create a log file: %s", err)
}
log.SetOutput(&lumberjack.Logger{
| </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err := os.MkdirAll(Context.getDataDir(), 0755)
</s> add err := os.MkdirAll(Context.getDataDir(), 0o755) | _, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644) | if filepath.IsAbs(ls.LogFile) {
logFilePath = ls.LogFile
}
_, err := os.OpenFile(logFilePath, os.O_WRONLY|os.O_CREATE|os.O_APPEND, 0o644)
if err != nil {
log.Fatalf("cannot create a log file: %s", err)
}
log.SetOutput(&lumberjack.Logger{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
Compress: ls.LogCompress, // disabled by default
LocalTime: ls.LogLocalTime,
MaxBackups: ls.LogMaxBackups,
MaxSize: ls.LogMaxSize, // megabytes
MaxAge: ls.LogMaxAge, //days
})
}
}
func cleanup() {
| </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return fmt.Errorf("DNS: failed to parse default upstreams: %v", err)
</s> add return fmt.Errorf("dns: failed to parse default upstreams: %v", err) </s> remove log.Debug("DHCPv4: removed lease %s", s.leases[i].HWAddr)
</s> add log.Debug("dhcpv4: removed lease %s", s.leases[i].HWAddr) </s> remove "github.com/joomcode/errorx"
</s> add | MaxAge: ls.LogMaxAge, // days | Compress: ls.LogCompress, // disabled by default
LocalTime: ls.LogLocalTime,
MaxBackups: ls.LogMaxBackups,
MaxSize: ls.LogMaxSize, // megabytes
MaxAge: ls.LogMaxAge, // days
})
}
}
func cleanup() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
continue
}
return con, err
}
return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
}
func getHTTPProxy(req *http.Request) (*url.URL, error) {
if len(config.ProxyURL) == 0 {
return nil, nil
| </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces")
</s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %s", err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewRuleStorage(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) | return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) | continue
}
return con, err
}
return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
}
func getHTTPProxy(req *http.Request) (*url.URL, error) {
if len(config.ProxyURL) == 0 {
return nil, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/home.go |
var err error
var p int
minPort, maxPort := 0, 1<<16-1
if p, err = strconv.Atoi(v); err != nil {
err = fmt.Errorf("port '%s' is not a number", v)
} else if p < minPort || p > maxPort {
err = fmt.Errorf("port %d not in range %d - %d", p, minPort, maxPort)
} else {
o.bindPort = p
}
| </s> remove return fmt.Errorf("%s is not a valid port: %s", port, err)
</s> add return fmt.Errorf("%s is not a valid port: %w", port, err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | err = fmt.Errorf("port %q is not a number", v) | var err error
var p int
minPort, maxPort := 0, 1<<16-1
if p, err = strconv.Atoi(v); err != nil {
err = fmt.Errorf("port %q is not a number", v)
} else if p < minPort || p > maxPort {
err = fmt.Errorf("port %d not in range %d - %d", p, minPort, maxPort)
} else {
o.bindPort = p
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/options.go |
"sync"
"time"
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
)
var tlsWebHandlersRegistered = false
// TLSMod - TLS module object
| </s> remove var (
nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID
)
</s> add var nextFilterID = time.Now().Unix() // semi-stable way to generate an unique ID </s> remove
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add | "sync"
"time"
"github.com/AdguardTeam/golibs/log"
)
var tlsWebHandlersRegistered = false
// TLSMod - TLS module object | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
|
func unmarshalTLS(r *http.Request) (tlsConfigSettings, error) {
data := tlsConfigSettings{}
err := json.NewDecoder(r.Body).Decode(&data)
if err != nil {
return data, errorx.Decorate(err, "Failed to parse new TLS config json")
}
if data.CertificateChain != "" {
certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
| </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key")
</s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove return errorx.Decorate(err, "Couldn't start forwarding DNS server")
</s> add return fmt.Errorf("couldn't start forwarding DNS server: %w", err) | return data, fmt.Errorf("failed to parse new TLS config json: %w", err) | func unmarshalTLS(r *http.Request) (tlsConfigSettings, error) {
data := tlsConfigSettings{}
err := json.NewDecoder(r.Body).Decode(&data)
if err != nil {
return data, fmt.Errorf("failed to parse new TLS config json: %w", err)
}
if data.CertificateChain != "" {
certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
if data.CertificateChain != "" {
certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
}
data.CertificateChain = string(certPEM)
if data.CertificatePath != "" {
return data, fmt.Errorf("certificate data and file can't be set together")
}
| </s> remove return data, errorx.Decorate(err, "Failed to base64-decode private key")
</s> add return data, fmt.Errorf("failed to base64-decode private key: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json")
</s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) | return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) |
if data.CertificateChain != "" {
certPEM, err := base64.StdEncoding.DecodeString(data.CertificateChain)
if err != nil {
return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err)
}
data.CertificateChain = string(certPEM)
if data.CertificatePath != "" {
return data, fmt.Errorf("certificate data and file can't be set together")
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
if data.PrivateKey != "" {
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
return data, errorx.Decorate(err, "Failed to base64-decode private key")
}
data.PrivateKey = string(keyPEM)
if data.PrivateKeyPath != "" {
return data, fmt.Errorf("private key data and file can't be set together")
| </s> remove return data, errorx.Decorate(err, "Failed to base64-decode certificate chain")
</s> add return data, fmt.Errorf("failed to base64-decode certificate chain: %w", err) </s> remove return data, errorx.Decorate(err, "Failed to parse new TLS config json")
</s> add return data, fmt.Errorf("failed to parse new TLS config json: %w", err) </s> remove return errorx.Decorate(err, "Failed to parse TLS keypair")
</s> add return fmt.Errorf("failed to parse TLS keypair: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) | return data, fmt.Errorf("failed to base64-decode private key: %w", err) |
if data.PrivateKey != "" {
keyPEM, err := base64.StdEncoding.DecodeString(data.PrivateKey)
if err != nil {
return data, fmt.Errorf("failed to base64-decode private key: %w", err)
}
data.PrivateKey = string(keyPEM)
if data.PrivateKeyPath != "" {
return data, fmt.Errorf("private key data and file can't be set together") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/tls.go |
for k, v := range v {
newDNSConfig[fmt.Sprint(k)] = v
}
default:
return fmt.Errorf("DNS configuration is not a map")
}
// Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside
if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok {
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)}
| </s> remove return fmt.Errorf("couldn't communicate with DNS server %s: %s", input, err)
</s> add return fmt.Errorf("couldn't communicate with dns server %s: %w", input, err) </s> remove return fmt.Errorf("DNS server %s returned wrong answer", input)
</s> add return fmt.Errorf("dns server %s returned wrong answer", input) </s> remove return fmt.Errorf("DNS server %s returned wrong answer: %v", input, t.A)
</s> add return fmt.Errorf("dns server %s returned wrong answer: %v", input, t.A) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) </s> remove log.Debug("IPSET: invalid value '%s'", it)
</s> add log.Debug("IPSET: invalid value %q", it) | return fmt.Errorf("dns configuration is not a map") | for k, v := range v {
newDNSConfig[fmt.Sprint(k)] = v
}
default:
return fmt.Errorf("dns configuration is not a map")
}
// Replace bootstrap_dns value filed with new array contains old bootstrap_dns inside
if bootstrapDNS, ok := (newDNSConfig)["bootstrap_dns"]; ok {
newBootstrapConfig := []string{fmt.Sprint(bootstrapDNS)} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/upgrade.go |
}
log.Debug("Whois: redirected to %s IP:%s", redir, target)
}
return "", fmt.Errorf("Whois: redirect loop")
}
// Request WHOIS information
func (w *Whois) process(ip string) [][]string {
data := [][]string{}
| </s> remove err := ioutil.WriteFile(fn, []byte(data), 0644)
</s> add err := ioutil.WriteFile(fn, []byte(data), 0o644) </s> remove log.Debug("DHCPv4: ICMP procedure is complete: %v", target)
</s> add log.Debug("dhcpv4: ICMP procedure is complete: %v", target) </s> remove log.Debug("DHCPv4: Sending ICMP Echo to %v", target)
</s> add log.Debug("dhcpv4: Sending ICMP Echo to %v", target) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | return "", fmt.Errorf("whois: redirect loop") | }
log.Debug("Whois: redirected to %s IP:%s", redir, target)
}
return "", fmt.Errorf("whois: redirect loop")
}
// Request WHOIS information
func (w *Whois) process(ip string) [][]string {
data := [][]string{} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/home/whois.go |
import (
"io"
"github.com/joomcode/errorx"
)
// QLogReader allows reading from multiple query log files in the reverse order.
//
// Please note that this is a stateful object.
| </s> remove
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove
"github.com/joomcode/errorx"
</s> add | "github.com/AdguardTeam/AdGuardHome/internal/agherr" |
import (
"io"
"github.com/AdguardTeam/AdGuardHome/internal/agherr"
)
// QLogReader allows reading from multiple query log files in the reverse order.
//
// Please note that this is a stateful object. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/querylog/qlog_reader.go |
}
}
if len(errs) > 0 {
return errorx.DecorateMany("Error while closing QLogReader", errs...)
}
return nil
}
| </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) </s> remove return fmt.Errorf("ID required")
</s> add return fmt.Errorf("id required") </s> remove e = ioutil.WriteFile(dst, d, 0644)
</s> add e = ioutil.WriteFile(dst, d, 0o644) </s> remove return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
</s> add return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) | return agherr.Many("Error while closing QLogReader", errs...) | }
}
if len(errs) > 0 {
return agherr.Many("Error while closing QLogReader", errs...)
}
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/querylog/qlog_reader.go |
defer resp.Body.Close()
}
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
| </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
</s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) | return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | defer resp.Body.Close()
}
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
}
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
}
u.versionJSON = body
u.versionCheckLastTime = time.Now()
| </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
</s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) | return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | }
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err)
}
u.versionJSON = body
u.versionCheckLastTime = time.Now()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
info := VersionInfo{}
versionJSON := make(map[string]interface{})
err := json.Unmarshal(data, &versionJSON)
if err != nil {
return info, fmt.Errorf("version.json: %s", err)
}
var ok1, ok2, ok3, ok4 bool
info.NewVersion, ok1 = versionJSON["version"].(string)
info.Announcement, ok2 = versionJSON["announcement"].(string)
| </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %w", err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err)
</s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err) | return info, fmt.Errorf("version.json: %w", err) | info := VersionInfo{}
versionJSON := make(map[string]interface{})
err := json.Unmarshal(data, &versionJSON)
if err != nil {
return info, fmt.Errorf("version.json: %w", err)
}
var ok1, ok2, ok3, ok4 bool
info.NewVersion, ok1 = versionJSON["version"].(string)
info.Announcement, ok2 = versionJSON["announcement"].(string) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/check.go |
log.Debug("updater: unpacking the package")
if strings.HasSuffix(pkgNameOnly, ".zip") {
u.unpackedFiles, err = zipFileUnpack(u.packageName, u.updateDir)
if err != nil {
return fmt.Errorf(".zip unpack failed: %s", err)
}
} else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
if err != nil {
| </s> remove return fmt.Errorf(".tar.gz unpack failed: %s", err)
</s> add return fmt.Errorf(".tar.gz unpack failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) | return fmt.Errorf(".zip unpack failed: %w", err) | log.Debug("updater: unpacking the package")
if strings.HasSuffix(pkgNameOnly, ".zip") {
u.unpackedFiles, err = zipFileUnpack(u.packageName, u.updateDir)
if err != nil {
return fmt.Errorf(".zip unpack failed: %w", err)
}
} else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
} else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
if err != nil {
return fmt.Errorf(".tar.gz unpack failed: %s", err)
}
} else {
return fmt.Errorf("unknown package extension")
}
| </s> remove return fmt.Errorf(".zip unpack failed: %s", err)
</s> add return fmt.Errorf(".zip unpack failed: %w", err) </s> remove log.Debug("DHCPv4: sending: %s", resp.Summary())
</s> add log.Debug("dhcpv4: sending: %s", resp.Summary()) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) | return fmt.Errorf(".tar.gz unpack failed: %w", err) |
} else if strings.HasSuffix(pkgNameOnly, ".tar.gz") {
u.unpackedFiles, err = tarGzFileUnpack(u.packageName, u.updateDir)
if err != nil {
return fmt.Errorf(".tar.gz unpack failed: %w", err)
}
} else {
return fmt.Errorf("unknown package extension")
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
func (u *Updater) check() error {
log.Debug("updater: checking configuration")
err := copyFile(u.ConfigName, filepath.Join(u.updateDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %s", err)
}
cmd := exec.Command(u.updateExeName, "--check-config")
err = cmd.Run()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command(): %s %d", err, cmd.ProcessState.ExitCode())
| </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err)
</s> add return fmt.Errorf(".zip unpack failed: %w", err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) | return fmt.Errorf("copyFile() failed: %w", err) | func (u *Updater) check() error {
log.Debug("updater: checking configuration")
err := copyFile(u.ConfigName, filepath.Join(u.updateDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %w", err)
}
cmd := exec.Command(u.updateExeName, "--check-config")
err = cmd.Run()
if err != nil || cmd.ProcessState.ExitCode() != 0 {
return fmt.Errorf("exec.Command(): %s %d", err, cmd.ProcessState.ExitCode()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}
func (u *Updater) backup() error {
log.Debug("updater: backing up the current configuration")
_ = os.Mkdir(u.backupDir, 0755)
err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %s", err)
}
| </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) | _ = os.Mkdir(u.backupDir, 0o755) | }
func (u *Updater) backup() error {
log.Debug("updater: backing up the current configuration")
_ = os.Mkdir(u.backupDir, 0o755)
err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %s", err)
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
log.Debug("updater: backing up the current configuration")
_ = os.Mkdir(u.backupDir, 0755)
err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %s", err)
}
// workdir/README.md -> backup/README.md
err = copySupportingFiles(u.unpackedFiles, u.WorkDir, u.backupDir)
if err != nil {
| </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) | return fmt.Errorf("copyFile() failed: %w", err) | log.Debug("updater: backing up the current configuration")
_ = os.Mkdir(u.backupDir, 0755)
err := copyFile(u.ConfigName, filepath.Join(u.backupDir, "AdGuardHome.yaml"))
if err != nil {
return fmt.Errorf("copyFile() failed: %w", err)
}
// workdir/README.md -> backup/README.md
err = copySupportingFiles(u.unpackedFiles, u.WorkDir, u.backupDir)
if err != nil { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
// Download package file and save it to disk
func (u *Updater) downloadPackageFile(url string, filename string) error {
resp, err := u.Client.Get(url)
if err != nil {
return fmt.Errorf("HTTP request failed: %s", err)
}
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
| </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %s", u.VersionURL, err)
</s> add return VersionInfo{}, fmt.Errorf("updater: HTTP GET %s: %w", u.VersionURL, err) | return fmt.Errorf("http request failed: %w", err) | // Download package file and save it to disk
func (u *Updater) downloadPackageFile(url string, filename string) error {
resp, err := u.Client.Get(url)
if err != nil {
return fmt.Errorf("http request failed: %w", err)
}
if resp != nil && resp.Body != nil {
defer resp.Body.Close()
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
log.Debug("updater: reading HTTP body")
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
}
_ = os.Mkdir(u.updateDir, 0755)
log.Debug("updater: saving package to file")
| </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) | return fmt.Errorf("ioutil.ReadAll() failed: %w", err) |
log.Debug("updater: reading HTTP body")
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return fmt.Errorf("ioutil.ReadAll() failed: %w", err)
}
_ = os.Mkdir(u.updateDir, 0755)
log.Debug("updater: saving package to file") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
if err != nil {
return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
}
_ = os.Mkdir(u.updateDir, 0755)
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
| </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err)
</s> add return fmt.Errorf(".zip unpack failed: %w", err) | _ = os.Mkdir(u.updateDir, 0o755) | if err != nil {
return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
}
_ = os.Mkdir(u.updateDir, 0o755)
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
_ = os.Mkdir(u.updateDir, 0755)
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
}
return nil
}
| </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
</s> add return fmt.Errorf("ioutil.WriteFile() failed: %w", err) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("copyFile() failed: %s", err)
</s> add return fmt.Errorf("copyFile() failed: %w", err) </s> remove _ = os.Mkdir(u.backupDir, 0755)
</s> add _ = os.Mkdir(u.backupDir, 0o755) | err = ioutil.WriteFile(filename, body, 0o644) |
_ = os.Mkdir(u.updateDir, 0755)
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0o644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
}
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %s", err)
}
return nil
}
// Unpack all files from .tar.gz file to the specified directory
| </s> remove err = ioutil.WriteFile(filename, body, 0644)
</s> add err = ioutil.WriteFile(filename, body, 0o644) </s> remove _ = os.Mkdir(u.updateDir, 0755)
</s> add _ = os.Mkdir(u.updateDir, 0o755) </s> remove return fmt.Errorf("ioutil.ReadAll() failed: %s", err)
</s> add return fmt.Errorf("ioutil.ReadAll() failed: %w", err) </s> remove return fmt.Errorf("HTTP request failed: %s", err)
</s> add return fmt.Errorf("http request failed: %w", err) </s> remove return fmt.Errorf(".zip unpack failed: %s", err)
</s> add return fmt.Errorf(".zip unpack failed: %w", err) | return fmt.Errorf("ioutil.WriteFile() failed: %w", err) |
log.Debug("updater: saving package to file")
err = ioutil.WriteFile(filename, body, 0644)
if err != nil {
return fmt.Errorf("ioutil.WriteFile() failed: %w", err)
}
return nil
}
// Unpack all files from .tar.gz file to the specified directory | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
// Return the list of files (not directories) written
func tarGzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %s", err)
}
defer func() {
_ = f.Close()
}()
| </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove return false, fmt.Errorf("open file: %s", err)
</s> add return false, fmt.Errorf("open file: %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) | return nil, fmt.Errorf("os.Open(): %w", err) | // Return the list of files (not directories) written
func tarGzFileUnpack(tarfile, outdir string) ([]string, error) {
f, err := os.Open(tarfile)
if err != nil {
return nil, fmt.Errorf("os.Open(): %w", err)
}
defer func() {
_ = f.Close()
}()
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %s", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader)
| </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err) </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) </s> remove return s, fmt.Errorf("DHCPv4: %s", err)
</s> add return s, fmt.Errorf("dhcpv4: %w", err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return fmt.Errorf("DHCPv6 RA: icmp.ListenPacket: %s", err)
</s> add return fmt.Errorf("dhcpv6 ra: icmp.ListenPacket: %w", err) | return nil, fmt.Errorf("gzip.NewReader(): %w", err) | }()
gzReader, err := gzip.NewReader(f)
if err != nil {
return nil, fmt.Errorf("gzip.NewReader(): %w", err)
}
var files []string
var err2 error
tarReader := tar.NewReader(gzReader) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %s", err)
break
}
_, inputNameOnly := filepath.Split(header.Name)
if len(inputNameOnly) == 0 {
| </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("zip file Open(): %s", err)
</s> add err2 = fmt.Errorf("zip file Open(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) | err2 = fmt.Errorf("tarReader.Next(): %w", err) | err2 = nil
break
}
if err != nil {
err2 = fmt.Errorf("tarReader.Next(): %w", err)
break
}
_, inputNameOnly := filepath.Split(header.Name)
if len(inputNameOnly) == 0 { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
outputName := filepath.Join(outdir, inputNameOnly)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
break
}
log.Debug("updater: created directory %s", outputName)
| </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err)
</s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) | err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) |
outputName := filepath.Join(outdir, inputNameOnly)
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
break
}
log.Debug("updater: created directory %s", outputName) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
break
}
log.Debug("updater: created directory %s", outputName)
continue
} else if header.Typeflag != tar.TypeReg {
| </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
</s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err)
</s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
</s> add f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) | err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) |
if header.Typeflag == tar.TypeDir {
err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err)
break
}
log.Debug("updater: created directory %s", outputName)
continue
} else if header.Typeflag != tar.TypeReg { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
continue
}
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
break
}
_, err = io.Copy(f, tarReader)
| </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
</s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) | f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) | log.Debug("updater: %s: unknown file type %d, skipping", inputNameOnly, header.Typeflag)
continue
}
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
break
}
_, err = io.Copy(f, tarReader) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
_ = f.Close()
| </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
</s> add f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) | err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) | }
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
if err != nil {
err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err)
break
}
_, err = io.Copy(f, tarReader)
if err != nil {
_ = f.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}
_, err = io.Copy(f, tarReader)
if err != nil {
_ = f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err)
| </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) | err2 = fmt.Errorf("io.Copy(): %w", err) | }
_, err = io.Copy(f, tarReader)
if err != nil {
_ = f.Close()
err2 = fmt.Errorf("io.Copy(): %w", err)
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err)
break
}
log.Debug("updater: created file %s", outputName)
files = append(files, header.Name)
| </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
</s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) | err2 = fmt.Errorf("f.Close(): %w", err) | break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %w", err)
break
}
log.Debug("updater: created file %s", outputName)
files = append(files, header.Name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
// Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
r, err := zip.OpenReader(zipfile)
if err != nil {
return nil, fmt.Errorf("zip.OpenReader(): %s", err)
}
defer r.Close()
var files []string
var err2 error
| </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return nil, fmt.Errorf("gzip.NewReader(): %s", err)
</s> add return nil, fmt.Errorf("gzip.NewReader(): %w", err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %s", f.FilePath, err)
</s> add return nil, nil, fmt.Errorf("filterlist.NewFileRuleList(): %s: %w", f.FilePath, err) | return nil, fmt.Errorf("zip.OpenReader(): %w", err) | // Return the list of files (not directories) written
func zipFileUnpack(zipfile, outdir string) ([]string, error) {
r, err := zip.OpenReader(zipfile)
if err != nil {
return nil, fmt.Errorf("zip.OpenReader(): %w", err)
}
defer r.Close()
var files []string
var err2 error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
var zr io.ReadCloser
for _, zf := range r.File {
zr, err = zf.Open()
if err != nil {
err2 = fmt.Errorf("zip file Open(): %s", err)
break
}
fi := zf.FileInfo()
inputNameOnly := fi.Name()
| </s> remove err2 = fmt.Errorf("tarReader.Next(): %s", err)
</s> add err2 = fmt.Errorf("tarReader.Next(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
</s> add f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) | err2 = fmt.Errorf("zip file Open(): %w", err) | var zr io.ReadCloser
for _, zf := range r.File {
zr, err = zf.Open()
if err != nil {
err2 = fmt.Errorf("zip file Open(): %w", err)
break
}
fi := zf.FileInfo()
inputNameOnly := fi.Name() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
if fi.IsDir() {
err = os.Mkdir(outputName, fi.Mode())
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %s", err)
break
}
log.Tracef("created directory %s", outputName)
continue
}
| </s> remove err2 = fmt.Errorf("os.Mkdir(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.Mkdir(%s): %w", outputName, err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
</s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) | err2 = fmt.Errorf("os.Mkdir(): %w", err) |
if fi.IsDir() {
err = os.Mkdir(outputName, fi.Mode())
if err != nil && !os.IsExist(err) {
err2 = fmt.Errorf("os.Mkdir(): %w", err)
break
}
log.Tracef("created directory %s", outputName)
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
if err != nil {
err2 = fmt.Errorf("os.OpenFile(): %s", err)
break
}
_, err = io.Copy(f, zr)
if err != nil {
_ = f.Close()
| </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0777))
</s> add f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, os.FileMode(header.Mode&0o777)) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err)
</s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) | err2 = fmt.Errorf("os.OpenFile(): %w", err) | }
f, err := os.OpenFile(outputName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, fi.Mode())
if err != nil {
err2 = fmt.Errorf("os.OpenFile(): %w", err)
break
}
_, err = io.Copy(f, zr)
if err != nil {
_ = f.Close() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
}
_, err = io.Copy(f, zr)
if err != nil {
_ = f.Close()
err2 = fmt.Errorf("io.Copy(): %s", err)
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err)
| </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(): %s", err)
</s> add err2 = fmt.Errorf("os.OpenFile(): %w", err) </s> remove err2 = fmt.Errorf("os.OpenFile(%s): %s", outputName, err)
</s> add err2 = fmt.Errorf("os.OpenFile(%s): %w", outputName, err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) | err2 = fmt.Errorf("io.Copy(): %w", err) | }
_, err = io.Copy(f, zr)
if err != nil {
_ = f.Close()
err2 = fmt.Errorf("io.Copy(): %w", err)
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %s", err)
break
}
log.Tracef("created file %s", outputName)
files = append(files, inputNameOnly)
| </s> remove err2 = fmt.Errorf("f.Close(): %s", err)
</s> add err2 = fmt.Errorf("f.Close(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("io.Copy(): %s", err)
</s> add err2 = fmt.Errorf("io.Copy(): %w", err) </s> remove err2 = fmt.Errorf("os.Mkdir(): %s", err)
</s> add err2 = fmt.Errorf("os.Mkdir(): %w", err) </s> remove err = os.Mkdir(outputName, os.FileMode(header.Mode&0777))
</s> add err = os.Mkdir(outputName, os.FileMode(header.Mode&0o777)) | err2 = fmt.Errorf("f.Close(): %w", err) | break
}
err = f.Close()
if err != nil {
err2 = fmt.Errorf("f.Close(): %w", err)
break
}
log.Tracef("created file %s", outputName)
files = append(files, inputNameOnly) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
d, e := ioutil.ReadFile(src)
if e != nil {
return e
}
e = ioutil.WriteFile(dst, d, 0644)
if e != nil {
return e
}
return nil
}
| </s> remove addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
</s> add addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return fmt.Errorf("ioutil.WriteFile: %s: %s", resolvedConfPath, err)
</s> add return fmt.Errorf("ioutil.WriteFile: %s: %w", resolvedConfPath, err) </s> remove err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0644)
</s> add err = ioutil.WriteFile(resolvedConfPath, []byte(resolvedConfData), 0o644) </s> remove return fmt.Errorf("os.MkdirAll: %s: %s", dir, err)
</s> add return fmt.Errorf("os.MkdirAll: %s: %w", dir, err) </s> remove return fmt.Errorf("wrong upstream format: %s", err)
</s> add return fmt.Errorf("wrong upstream format: %w", err) | e = ioutil.WriteFile(dst, d, 0o644) | d, e := ioutil.ReadFile(src)
if e != nil {
return e
}
e = ioutil.WriteFile(dst, d, 0o644)
if e != nil {
return e
}
return nil
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/update/updater.go |
"syscall"
"time"
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
)
// NetInterface represents a list of network interfaces
type NetInterface struct {
Name string // Network interface name
| </s> remove "github.com/joomcode/errorx"
</s> add </s> remove "github.com/joomcode/errorx"
</s> add </s> remove const cookieTTL = 365 * 24 // in hours
const sessionCookieName = "agh_session"
</s> add const (
cookieTTL = 365 * 24 // in hours
sessionCookieName = "agh_session"
) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) | "syscall"
"time"
"github.com/AdguardTeam/golibs/log"
)
// NetInterface represents a list of network interfaces
type NetInterface struct {
Name string // Network interface name | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
|
// invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
}
netIfaces := []net.Interface{}
for i := range ifaces {
| </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces")
</s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
</s> add addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) </s> remove return nil, fmt.Errorf("os.Open(): %s", err)
</s> add return nil, fmt.Errorf("os.Open(): %w", err) </s> remove return nil, fmt.Errorf("zip.OpenReader(): %s", err)
</s> add return nil, fmt.Errorf("zip.OpenReader(): %w", err) | return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) | // invalid interface is a ppp interface or the one that doesn't allow broadcasts
func GetValidNetInterfaces() ([]net.Interface, error) {
ifaces, err := net.Interfaces()
if err != nil {
return nil, fmt.Errorf("couldn't get list of interfaces: %w", err)
}
netIfaces := []net.Interface{}
for i := range ifaces { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
// we do not return link-local addresses here
func GetValidNetInterfacesForWeb() ([]NetInterface, error) {
ifaces, err := GetValidNetInterfaces()
if err != nil {
return nil, errorx.Decorate(err, "Couldn't get interfaces")
}
if len(ifaces) == 0 {
return nil, errors.New("couldn't find any legible interface")
}
| </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
</s> add addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) </s> remove return nil, errorx.DecorateMany(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...)
</s> add return nil, agherr.Many(fmt.Sprintf("couldn't dial to %s", addr), dialErrs...) </s> remove func wrapErrPrint(err error, message string, args ...interface{}) error {
var errx error
if err == nil {
errx = fmt.Errorf(message, args...)
} else {
errx = errorx.Decorate(err, message, args...)
}
log.Println(errx.Error())
return errx
}
</s> add </s> remove return false, wrapErrPrint(err, "Couldn't find interface by name %s", ifaceName)
</s> add return false, fmt.Errorf("couldn't find interface by name %s: %w", ifaceName, err) | return nil, fmt.Errorf("couldn't get interfaces: %w", err) | // we do not return link-local addresses here
func GetValidNetInterfacesForWeb() ([]NetInterface, error) {
ifaces, err := GetValidNetInterfaces()
if err != nil {
return nil, fmt.Errorf("couldn't get interfaces: %w", err)
}
if len(ifaces) == 0 {
return nil, errors.New("couldn't find any legible interface")
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
var netInterfaces []NetInterface
for _, iface := range ifaces {
addrs, e := iface.Addrs()
if e != nil {
return nil, errorx.Decorate(e, "Failed to get addresses for interface %s", iface.Name)
}
netIface := NetInterface{
Name: iface.Name,
MTU: iface.MTU,
| </s> remove e = ioutil.WriteFile(dst, d, 0644)
</s> add e = ioutil.WriteFile(dst, d, 0o644) </s> remove return nil, fmt.Errorf("couldn't get list of interfaces: %s", err)
</s> add return nil, fmt.Errorf("couldn't get list of interfaces: %w", err) </s> remove log.Debug("DHCPv4: no IPv6 address for interface %s", iface.Name)
</s> add log.Debug("dhcpv4: no IPv6 address for interface %s", iface.Name) </s> remove return nil, errorx.Decorate(err, "Couldn't get interfaces")
</s> add return nil, fmt.Errorf("couldn't get interfaces: %w", err) </s> remove log.Debug("DHCPv4: Bad OptionRequestedIPAddress in Request message for %s", mac)
</s> add log.Debug("dhcpv4: Bad OptionRequestedIPAddress in Request message for %s", mac) | addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err) |
var netInterfaces []NetInterface
for _, iface := range ifaces {
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err)
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err)
addrs, err := iface.Addrs()
if err != nil {
return nil, fmt.Errorf("failed to get addresses for interface %s: %w", iface.Name, err)
}
netIface := NetInterface{
Name: iface.Name,
MTU: iface.MTU, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Pull request:* all: remove github.com/joomcode/errorx dependency
Merge in DNS/adguard-home from 2240-removing-errorx-dependency to master
Squashed commit of the following:
commit 5bbe0567356f06e3b9ee5b3dc38d357b472cacb1
Merge: a6040850d 02d16a0b4
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:32:22 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit a6040850da3cefb131208097477b0956e80063fb
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 14:23:36 2020 +0300
* dhcpd: convert some abbreviations to lowercase.
commit d05bd51b994906b0ff52c5a8e779bd1f512f4bb7
Author: Eugene Burkov <[email protected]>
Date: Thu Nov 5 12:47:20 2020 +0300
* agherr: last final fixes
commit 164bca55035ff44e50b0abb33e129a0d24ffe87c
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 19:11:10 2020 +0300
* all: final fixes again
commit a0ac26f409c0b28a176cf2861d52c2f471b59484
Author: Ainar Garipov <[email protected]>
Date: Tue Nov 3 18:51:39 2020 +0300
* all: final fixes
commit 6147b02d402b513323b07e85856b348884f3a088
Merge: 9fd3af1a3 62cc334f4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:26:03 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit 9fd3af1a39a3189b5c41315a8ad1568ae5cb4fc9
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 18:23:08 2020 +0300
* all: remove useless helper
commit 7cd9aeae639762b28b25f354d69c5cf74f670211
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 17:19:26 2020 +0300
* agherr: improved code tidiness
commit a74a49236e9aaace070646dac710de9201105262
Merge: dc9dedbf2 df34ee5c0
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:54:29 2020 +0300
Merge branch 'master' into 2240-removing-errorx-dependency
commit dc9dedbf205756e3adaa3bc776d349bf3d8c69a5
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 16:40:08 2020 +0300
* agherr: improve and cover by tests
commit fd6bfe9e282156cc60e006cb7cd46cce4d3a07a8
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 14:06:27 2020 +0300
* all: improve code quality
commit ea00c2f8c5060e9611f9a80cfd0e4a039526d0c4
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 13:03:57 2020 +0300
* all: fix linter style warnings
commit 8e75e1a681a7218c2b4c69adfa2b7e1e2966f9ac
Author: Eugene Burkov <[email protected]>
Date: Tue Nov 3 12:29:26 2020 +0300
* all: remove github.com/joomcode/errorx dependency
Closes #2240. | https://github.com/AdguardTeam/AdGuardHome/commit/2baa33fb1f69dc01e91b585373dfedcb8c888693 | internal/util/network_utils.go |
dnsProxy *proxy.Proxy // DNS proxy instance
dnsFilter *dnsfilter.Dnsfilter // DNS filter instance
queryLog *queryLog // Query log instance
stats *stats // General server statistics
once sync.Once
AllowedClients map[string]bool // IP addresses of whitelist clients
DisallowedClients map[string]bool // IP addresses of clients that should be blocked
AllowedClientsIPNet []net.IPNet // CIDRs of whitelist clients
DisallowedClientsIPNet []net.IPNet // CIDRs of clients that should be blocked
| </s> remove return &Server{
</s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
</s> add </s> remove if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
</s> add | dnsProxy *proxy.Proxy // DNS proxy instance
dnsFilter *dnsfilter.Dnsfilter // DNS filter instance
queryLog *queryLog // Query log instance
stats *stats // General server statistics
AllowedClients map[string]bool // IP addresses of whitelist clients
DisallowedClients map[string]bool // IP addresses of clients that should be blocked
AllowedClientsIPNet []net.IPNet // CIDRs of whitelist clients
DisallowedClientsIPNet []net.IPNet // CIDRs of clients that should be blocked | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
|
// NewServer creates a new instance of the dnsforward.Server
// baseDir is the base directory for query logs
func NewServer(baseDir string) *Server {
s := &Server{
queryLog: newQueryLog(baseDir),
stats: newStats(),
}
| </s> remove return &Server{
</s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
</s> add </s> remove if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
</s> add </s> remove once sync.Once
</s> add | // Note: this function must be called only once | // NewServer creates a new instance of the dnsforward.Server
// baseDir is the base directory for query logs
// Note: this function must be called only once
func NewServer(baseDir string) *Server {
s := &Server{
queryLog: newQueryLog(baseDir),
stats: newStats(),
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
// NewServer creates a new instance of the dnsforward.Server
// baseDir is the base directory for query logs
func NewServer(baseDir string) *Server {
return &Server{
queryLog: newQueryLog(baseDir),
stats: newStats(),
}
}
| </s> remove log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
</s> add </s> remove if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
</s> add </s> remove once sync.Once
</s> add | s := &Server{ |
// NewServer creates a new instance of the dnsforward.Server
// baseDir is the base directory for query logs
func NewServer(baseDir string) *Server {
s := &Server{
queryLog: newQueryLog(baseDir),
stats: newStats(),
}
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
stats: newStats(),
}
}
// FilteringConfig represents the DNS filtering configuration of AdGuard Home
// The zero FilteringConfig is empty and ready for use.
type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features
| </s> remove return &Server{
</s> add s := &Server{ </s> remove log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
</s> add </s> remove once sync.Once
</s> add </s> remove if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
</s> add | log.Tracef("Loading stats from querylog")
err := s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
log.Error("failed to load stats from querylog: %s", err)
}
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
return s | stats: newStats(),
}
log.Tracef("Loading stats from querylog")
err := s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
log.Error("failed to load stats from querylog: %s", err)
}
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
return s
}
// FilteringConfig represents the DNS filtering configuration of AdGuard Home
// The zero FilteringConfig is empty and ready for use.
type FilteringConfig struct {
ProtectionEnabled bool `yaml:"protection_enabled"` // whether or not use any of dnsfilter features | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
if s.dnsFilter != nil || s.dnsProxy != nil {
return errors.New("DNS server is already started")
}
if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
err := s.initDNSFilter()
if err != nil {
return err
}
| </s> remove log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
</s> add </s> remove return &Server{
</s> add s := &Server{ </s> remove once sync.Once
</s> add | if s.dnsFilter != nil || s.dnsProxy != nil {
return errors.New("DNS server is already started")
}
err := s.initDNSFilter()
if err != nil {
return err
}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
|
if err != nil {
return err
}
log.Tracef("Loading stats from querylog")
err = s.queryLog.fillStatsFromQueryLog(s.stats)
if err != nil {
return errorx.Decorate(err, "failed to load stats from querylog")
}
// TODO: Think about reworking this, the current approach won't work properly if AG Home is restarted periodically
s.once.Do(func() {
log.Printf("Start DNS server periodic jobs")
go s.queryLog.periodicQueryLogRotate()
go s.queryLog.runningTop.periodicHourlyTopRotate()
go s.stats.statsRotator()
})
proxyConfig := proxy.Config{
UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
Ratelimit: s.conf.Ratelimit,
RatelimitWhitelist: s.conf.RatelimitWhitelist,
| </s> remove if s.queryLog == nil {
s.queryLog = newQueryLog(".")
}
if s.stats == nil {
s.stats = newStats()
}
</s> add </s> remove return &Server{
</s> add s := &Server{ </s> remove once sync.Once
</s> add | if err != nil {
return err
}
proxyConfig := proxy.Config{
UDPListenAddr: s.conf.UDPListenAddr,
TCPListenAddr: s.conf.TCPListenAddr,
Ratelimit: s.conf.Ratelimit,
RatelimitWhitelist: s.conf.RatelimitWhitelist, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | * dnsforward: move initialization of periodic tasks to NewServer() | https://github.com/AdguardTeam/AdGuardHome/commit/2bbd2629682d003791ada3b584a8fd2d46a40ff9 | dnsforward/dnsforward.go |
|
publish: false
license: GPL-3.0
apps:
adguard-home:
args: -w ${SNAP_DATA} --no-check-update
plugs: [ network-bind ]
daemon: simple
checksum:
name_template: 'checksums.txt'
| </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json
</s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt
</s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge
</s> add # Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove
# Remove leading "v" from the tag name
RELEASE_VERSION=$(TAG_NAME:v%=%)
</s> add RELEASE_VERSION=$(TAG_NAME) | command: AdGuardHome -w $SNAP_DATA --no-check-update | publish: false
license: GPL-3.0
apps:
adguard-home:
command: AdGuardHome -w $SNAP_DATA --no-check-update
plugs: [ network-bind ]
daemon: simple
checksum:
name_template: 'checksums.txt' | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix project name, update README | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | .goreleaser.yml |
# Version properties
COMMIT=$(shell git rev-parse --short HEAD)
TAG_NAME=$(shell git describe --abbrev=0)
# Remove leading "v" from the tag name
RELEASE_VERSION=$(TAG_NAME:v%=%)
SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
# Set proper version
VERSION=
ifeq ($(TAG_NAME),$(shell git describe --abbrev=4))
| </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge
</s> add # Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt
</s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json
</s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove args: -w ${SNAP_DATA} --no-check-update
</s> add command: AdGuardHome -w $SNAP_DATA --no-check-update | RELEASE_VERSION=$(TAG_NAME) |
# Version properties
COMMIT=$(shell git rev-parse --short HEAD)
TAG_NAME=$(shell git describe --abbrev=0)
RELEASE_VERSION=$(TAG_NAME)
RELEASE_VERSION=$(TAG_NAME)
RELEASE_VERSION=$(TAG_NAME)
SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
# Set proper version
VERSION=
ifeq ($(TAG_NAME),$(shell git describe --abbrev=4)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix project name, update README | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
ifeq ($(CHANNEL),beta)
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta
endif
ifeq ($(CHANNEL),edge)
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge
endif
endif
# Validate docker build arguments
ifndef DOCKER_IMAGE_NAME
| </s> remove
# Remove leading "v" from the tag name
RELEASE_VERSION=$(TAG_NAME:v%=%)
</s> add RELEASE_VERSION=$(TAG_NAME) </s> remove echo "version=v$(version)" > $(DIST_DIR)/version.txt
</s> add echo "version=$(version)" > $(DIST_DIR)/version.txt </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json
</s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove args: -w ${SNAP_DATA} --no-check-update
</s> add command: AdGuardHome -w $SNAP_DATA --no-check-update | # Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge | ifeq ($(CHANNEL),beta)
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta
endif
ifeq ($(CHANNEL),edge)
# Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge
endif
endif
# Validate docker build arguments
ifndef DOCKER_IMAGE_NAME | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix project name, update README | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
@echo Writing version file: $(version)
# Variables for CI
rm -f $(DIST_DIR)/version.txt
echo "version=v$(version)" > $(DIST_DIR)/version.txt
# Prepare the version.json file
rm -f $(DIST_DIR)/version.json
echo "{" >> $(DIST_DIR)/version.json
echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json
| </s> remove echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json
</s> add echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json </s> remove
# Remove leading "v" from the tag name
RELEASE_VERSION=$(TAG_NAME:v%=%)
</s> add RELEASE_VERSION=$(TAG_NAME) </s> remove DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge
</s> add # Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge </s> remove args: -w ${SNAP_DATA} --no-check-update
</s> add command: AdGuardHome -w $SNAP_DATA --no-check-update | echo "version=$(version)" > $(DIST_DIR)/version.txt | @echo Writing version file: $(version)
# Variables for CI
rm -f $(DIST_DIR)/version.txt
echo "version=$(version)" > $(DIST_DIR)/version.txt
# Prepare the version.json file
rm -f $(DIST_DIR)/version.json
echo "{" >> $(DIST_DIR)/version.json
echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | Fix project name, update README | https://github.com/AdguardTeam/AdGuardHome/commit/2bbffffcfc875558eddf590b3185b968ff969ede | Makefile |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.