Merge pull request #25 from duedil-ltd/feature/default-ttl

Implement a default TTL on all records (5 mins)
duedil-ltd · Aug 11, 2014 · 7207b66 · 7207b66
2 parents 044150b + a73e127
commit 7207b66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/main.go b/main.go
@@ -26,6 +26,7 @@ var (
         MetricsDuration     int         `short:"m" long:"metrics" description:"Dump metrics to stderr every N seconds" default:"30"`
         GraphiteServer      string      `long:"graphite" description:"Graphite server to send metrics to"`
         GraphiteDuration    int         `long:"graphite-duration" description:"Duration to periodically send metrics to the graphite server" default:"10"`
+        DefaultTtl          uint32      `short:"t" long:"default-ttl" description:"Default TTL to return on records without an explicit TTL" default:"300"`
     }
 )
 
@@ -81,7 +82,8 @@ func main() {
         port: Options.ListenPort,
         etcd: etcd,
         rTimeout: time.Duration(5) * time.Second,
-        wTimeout: time.Duration(5) * time.Second}
+        wTimeout: time.Duration(5) * time.Second,
+        defaultTtl: Options.DefaultTtl}
 
     server.Run()
 

diff --git a/resolver.go b/resolver.go
@@ -16,6 +16,7 @@ import (
 type Resolver struct {
     etcd        *etcd.Client
     etcdPrefix  string
+    defaultTtl  uint32
 }
 
 type EtcdRecord struct {
@@ -62,14 +63,14 @@ func (r *Resolver) GetFromStorage(key string) (nodes []*EtcdRecord, err error) {
                     }
                 } else {
                     if lastValNode != nil {
-                        findKeys(lastValNode, 0, false)
+                        findKeys(lastValNode, r.defaultTtl, false)
                     }
                     lastValNode = node
                 }
             }
 
             if lastValNode != nil {
-                findKeys(lastValNode, 0, false)
+                findKeys(lastValNode, r.defaultTtl, false)
             }
         } else {
             // If for some reason this is passed a ttl node unexpectedly, bail
@@ -98,7 +99,7 @@ func (r *Resolver) GetFromStorage(key string) (nodes []*EtcdRecord, err error) {
         }
     }
 
-    findKeys(response.Node, 0, true)
+    findKeys(response.Node, r.defaultTtl, true)
 
     return
 }

diff --git a/server.go b/server.go
@@ -14,6 +14,7 @@ type Server struct {
     etcd        *etcd.Client
     rTimeout    time.Duration
     wTimeout    time.Duration
+    defaultTtl  uint32
 }
 
 type Handler struct {
@@ -59,7 +60,7 @@ func (s *Server) Run() {
     udp_request_counter := metrics.NewCounter()
     metrics.Register("request.handler.udp.requests", udp_request_counter)
 
-    resolver := Resolver{etcd: s.etcd}
+    resolver := Resolver{etcd: s.etcd, defaultTtl: s.defaultTtl}
     tcpDNShandler := &Handler{
         resolver: &resolver,
         request_counter: tcp_request_counter,