joker/godns
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#26

Browse Source 
1.Ensure hosts records refresh and get operation is thread safe.
2. Clear redis backend hosts records  during refresh operation.
This commit is contained in:
kenshinx 2016-09-06 12:02:20 +08:00
parent 4275900fb2
commit 8e14764aa7
1 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hosts.go
View File

@ -6,6 +6,7 @@ import (
"os" "os"
"regexp" "regexp"
"strings" "strings"
"sync"
"time" "time"
"github.com/hoisie/redis" "github.com/hoisie/redis"
@ -17,12 +18,19 @@ type Hosts struct {
} }
func NewHosts(hs HostsSettings, rs RedisSettings) Hosts { func NewHosts(hs HostsSettings, rs RedisSettings) Hosts {
fileHosts := &FileHosts{hs.HostsFile, make(map[string]string)} fileHosts := &FileHosts{
file: hs.HostsFile,
hosts: make(map[string]string),
}
var redisHosts *RedisHosts var redisHosts *RedisHosts
if hs.RedisEnable { if hs.RedisEnable {
rc := &redis.Client{Addr: rs.Addr(), Db: rs.DB, Password: rs.Password} rc := &redis.Client{Addr: rs.Addr(), Db: rs.DB, Password: rs.Password}
redisHosts = &RedisHosts{rc, hs.RedisKey, make(map[string]string)} redisHosts = &RedisHosts{
redis: rc,
key: hs.RedisKey,
hosts: make(map[string]string),
}
} }
hosts := Hosts{fileHosts, redisHosts} hosts := Hosts{fileHosts, redisHosts}
@ -72,7 +80,7 @@ func (h *Hosts) Get(domain string, family int) ([]net.IP, bool) {
Update hosts records from /etc/hosts file and redis per minute Update hosts records from /etc/hosts file and redis per minute
*/ */
func (h *Hosts) refresh() { func (h *Hosts) refresh() {
ticker := time.NewTicker(time.Minute) ticker := time.NewTicker(time.Second * 5)
go func() { go func() {
for { for {
h.fileHosts.Refresh() h.fileHosts.Refresh()
@ -84,19 +92,18 @@ func (h *Hosts) refresh() {
}() }()
} }
type BaseHosts struct {
hosts map[string]string
}
type RedisHosts struct { type RedisHosts struct {
redis *redis.Client redis *redis.Client
key string key string
hosts map[string]string hosts map[string]string
mu sync.RWMutex
} }
func (r *RedisHosts) Get(domain string) ([]string, bool) { func (r *RedisHosts) Get(domain string) ([]string, bool) {
domain = strings.ToLower(domain) domain = strings.ToLower(domain)
r.mu.RLock()
ip, ok := r.hosts[domain] ip, ok := r.hosts[domain]
r.mu.RUnlock()
if ok { if ok {
return strings.Split(ip, ","), true return strings.Split(ip, ","), true
} }
@ -113,10 +120,15 @@ func (r *RedisHosts) Get(domain string) ([]string, bool) {
} }
func (r *RedisHosts) Set(domain, ip string) (bool, error) { func (r *RedisHosts) Set(domain, ip string) (bool, error) {
r.mu.Lock()
defer r.mu.Unlock()
return r.redis.Hset(r.key, strings.ToLower(domain), []byte(ip)) return r.redis.Hset(r.key, strings.ToLower(domain), []byte(ip))
} }
func (r *RedisHosts) Refresh() { func (r *RedisHosts) Refresh() {
r.mu.Lock()
defer r.mu.Unlock()
r.clear()
err := r.redis.Hgetall(r.key, r.hosts) err := r.redis.Hgetall(r.key, r.hosts)
if err != nil { if err != nil {
logger.Warn("Update hosts records from redis failed %s", err) logger.Warn("Update hosts records from redis failed %s", err)
@ -125,14 +137,21 @@ func (r *RedisHosts) Refresh() {
} }
} }
func (r *RedisHosts) clear() {
r.hosts = make(map[string]string)
}
type FileHosts struct { type FileHosts struct {
file string file string
hosts map[string]string hosts map[string]string
mu sync.RWMutex
} }
func (f *FileHosts) Get(domain string) ([]string, bool) { func (f *FileHosts) Get(domain string) ([]string, bool) {
domain = strings.ToLower(domain) domain = strings.ToLower(domain)
f.mu.RLock()
ip, ok := f.hosts[domain] ip, ok := f.hosts[domain]
f.mu.RUnlock()
if !ok { if !ok {
return nil, false return nil, false
} }
@ -147,6 +166,9 @@ func (f *FileHosts) Refresh() {
} }
defer buf.Close() defer buf.Close()
f.mu.Lock()
defer f.mu.Unlock()
f.clear() f.clear()
scanner := bufio.NewScanner(buf) scanner := bufio.NewScanner(buf)