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

refactor memory cache into map[string]dns.Msg

This commit is contained in:
kenshin 2013-07-24 19:01:31 +08:00
parent 51be27eee9
commit 0dfc4bf100
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cache.go
View File

@ -47,24 +47,24 @@ type Cache interface {
} }
type MemoryCache struct { type MemoryCache struct {
backend map[string]string backend map[string]*dns.Msg
serializer *JsonSerializer serializer *JsonSerializer
expire time.Duration expire time.Duration
maxcount int maxcount int
} }
func (c *MemoryCache) Get(key string) (*dns.Msg, error) { func (c *MemoryCache) Get(key string) (*dns.Msg, error) {
fmt.Println(c.backend)
data, ok := c.backend[key] mesg, ok := c.backend[key]
if !ok { if !ok {
return nil, KeyNotFound{key} return nil, KeyNotFound{key}
} }
mesg := new(dns.Msg) // mesg := new(dns.Msg)
if err := c.serializer.Loads([]byte(data), &mesg); err != nil { // if err := c.serializer.Loads([]byte(data), &mesg); err != nil {
fmt.Println(err) // fmt.Println(err)
return nil, SerializerError{} // return nil, SerializerError{}
} // }
return mesg, nil return mesg, nil
} }
@ -73,13 +73,14 @@ func (c *MemoryCache) Set(key string, mesg *dns.Msg) error {
if c.Full() && !c.Exists(key) { if c.Full() && !c.Exists(key) {
return CacheIsFull{} return CacheIsFull{}
} }
data, err := c.serializer.Dumps(mesg) // data, err := c.serializer.Dumps(mesg)
if err != nil { // if err != nil {
return SerializerError{} // return SerializerError{}
} // }
c.backend[key] = string(data) // c.backend[key] = string(data)
c.backend[key] = mesg
return nil return nil
} }

8
handler.go
View File

@ -2,8 +2,6 @@ package main
import ( import (
"github.com/miekg/dns" "github.com/miekg/dns"
// "log"
"fmt"
) )
type Question struct { type Question struct {
@ -44,14 +42,14 @@ func NewHandler() *GODNSHandler {
switch cacheConfig.Backend { switch cacheConfig.Backend {
case "memory": case "memory":
cache = &MemoryCache{ cache = &MemoryCache{
backend: make(map[string]string), backend: make(map[string]*dns.Msg),
serializer: new(JsonSerializer), serializer: new(JsonSerializer),
expire: cacheConfig.Expire, expire: cacheConfig.Expire,
maxcount: cacheConfig.Maxcount, maxcount: cacheConfig.Maxcount,
} }
case "redis": case "redis":
cache = &MemoryCache{ cache = &MemoryCache{
backend: make(map[string]string), backend: make(map[string]*dns.Msg),
serializer: new(JsonSerializer), serializer: new(JsonSerializer),
expire: cacheConfig.Expire, expire: cacheConfig.Expire,
maxcount: cacheConfig.Maxcount, maxcount: cacheConfig.Maxcount,
@ -71,7 +69,6 @@ func (h *GODNSHandler) do(net string, w dns.ResponseWriter, req *dns.Msg) {
Debug("Question:　%s", Q.String()) Debug("Question:　%s", Q.String())
key := KeyGen(Q) key := KeyGen(Q)
fmt.Println(key)
// Only query cache when qtype == 'A' , qclass == 'IN' // Only query cache when qtype == 'A' , qclass == 'IN'
if q.Qtype == dns.TypeA && q.Qclass == dns.ClassINET { if q.Qtype == dns.TypeA && q.Qclass == dns.ClassINET {
mesg, err := h.cache.Get(key) mesg, err := h.cache.Get(key)
@ -79,6 +76,7 @@ func (h *GODNSHandler) do(net string, w dns.ResponseWriter, req *dns.Msg) {
Debug("%s didn't hit cache: %s", Q.String(), err) Debug("%s didn't hit cache: %s", Q.String(), err)
} else { } else {
Debug("%s hit cache", Q.String()) Debug("%s hit cache", Q.String())
mesg.Id = req.Id
w.WriteMsg(mesg) w.WriteMsg(mesg)
return return
} }