Mirrors/coredns
1
0
Fork 0
mirror of https://github.com/coredns/coredns.git synced 2025-11-02 10:13:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

move ReadHosts out of the lock

Browse Source
This commit is contained in:
Pat Moroney
2017-10-24 10:34:16 -06:00
parent 7ad99d0d36
commit 680e6bd5c3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/hosts/hostsfile.go
View File

@@ -161,9 +161,9 @@ func ipVersion(s string) int {
// LookupStaticHostV4 looks up the IPv4 addresses for the given host from the hosts file. // LookupStaticHostV4 looks up the IPv4 addresses for the given host from the hosts file.
func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP { func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP {
h.ReadHosts()
h.RLock() h.RLock()
defer h.RUnlock() defer h.RUnlock()
h.ReadHosts()
if len(h.byNameV4) != 0 { if len(h.byNameV4) != 0 {
if ips, ok := h.byNameV4[absDomainName(host)]; ok { if ips, ok := h.byNameV4[absDomainName(host)]; ok {
ipsCp := make([]net.IP, len(ips)) ipsCp := make([]net.IP, len(ips))
@@ -176,9 +176,9 @@ func (h *Hostsfile) LookupStaticHostV4(host string) []net.IP {
// LookupStaticHostV6 looks up the IPv6 addresses for the given host from the hosts file. // LookupStaticHostV6 looks up the IPv6 addresses for the given host from the hosts file.
func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP { func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP {
h.ReadHosts()
h.RLock() h.RLock()
defer h.RUnlock() defer h.RUnlock()
h.ReadHosts()
if len(h.byNameV6) != 0 { if len(h.byNameV6) != 0 {
if ips, ok := h.byNameV6[absDomainName(host)]; ok { if ips, ok := h.byNameV6[absDomainName(host)]; ok {
ipsCp := make([]net.IP, len(ips)) ipsCp := make([]net.IP, len(ips))
@@ -191,9 +191,9 @@ func (h *Hostsfile) LookupStaticHostV6(host string) []net.IP {
// LookupStaticAddr looks up the hosts for the given address from the hosts file. // LookupStaticAddr looks up the hosts for the given address from the hosts file.
func (h *Hostsfile) LookupStaticAddr(addr string) []string { func (h *Hostsfile) LookupStaticAddr(addr string) []string {
h.ReadHosts()
h.RLock() h.RLock()
defer h.RUnlock() defer h.RUnlock()
h.ReadHosts()
addr = parseLiteralIP(addr).String() addr = parseLiteralIP(addr).String()
if addr == "" { if addr == "" {
return nil return nil