support configurable zone reload time + formating

Signed-off-by: Khash Sajadi <[email protected]>

Author: khash

README.md

@@ -32,6 +32,7 @@ In the Corefile, `mysql` can be configured with the following parameters:
 `max_open_connections` Maximum number of open connections to the database server. Default is 10.
 `max_idle_connections` Maximum number of idle connections in the database connection pool. Default is 10.
 `ttl` Default TTL for records without a specified TTL in seconds. Default is 360 (seconds)
+`zone_update_interval` Maximum time interval between loading all the zones from the database. Default is 10 minutes.
 
 ## Database Setup
 This plugin doesn't create or migrate database schema for its use yet. To create the database and tables, use the following table structure (note the table name prefix):

handler.go

@@ -11,18 +11,18 @@ import (
 )
 
 type CoreDNSMySql struct {
-	Next           plugin.Handler
-	Dsn string
-	TablePrefix string
-	MaxLifetime time.Duration
+	Next               plugin.Handler
+	Dsn                string
+	TablePrefix        string
+	MaxLifetime        time.Duration
 	MaxOpenConnections int
 	MaxIdleConnections int
-	Ttl            uint32
+	Ttl                uint32
 
-	tableName string
+	tableName      string
 	lastZoneUpdate time.Time
 	zoneUpdateTime time.Duration
-	zones []string
+	zones          []string
 }
 
 // ServeDNS implements the plugin.Handler interface.
@@ -52,9 +52,9 @@ func (handler *CoreDNSMySql) ServeDNS(ctx context.Context, w dns.ResponseWriter,
 	if len(records) == 0 {
 		// no record found but we are going to return a SOA
 		rec := &Record{
-			Name: qName,
+			Name:       qName,
 			RecordType: "SOA",
-			Content: "{}",
+			Content:    "{}",
 		}
 		records = append(records, rec)
 	}

setup.go

@@ -12,10 +12,11 @@ import (
 )
 
 const (
-	defaultTtl = 360
-	defaultMaxLifeTime = 1*time.Minute
+	defaultTtl                = 360
+	defaultMaxLifeTime        = 1 * time.Minute
 	defaultMaxOpenConnections = 10
 	defaultMaxIdleConnections = 10
+	defaultZoneUpdateTime     = 10 * time.Minute
 )
 
 func init() {
@@ -90,6 +91,16 @@ func mysqlParse(c *caddy.Controller) (*CoreDNSMySql, error) {
 					val = defaultMaxIdleConnections
 				}
 				mysql.MaxIdleConnections = val
+			case "zone_update_interval":
+				if !c.NextArg() {
+					return &CoreDNSMySql{}, c.ArgErr()
+				}
+				var val time.Duration
+				val, err = time.ParseDuration(c.Val())
+				if err != nil {
+					val = defaultZoneUpdateTime
+				}
+				mysql.zoneUpdateTime = val
 			case "ttl":
 				if !c.NextArg() {
 					return &CoreDNSMySql{}, c.ArgErr()

types.go

@@ -12,18 +12,18 @@ type Record struct {
 	Zone       string
 	Name       string
 	RecordType string
-	Ttl uint32
-	Content string
+	Ttl        uint32
+	Content    string
 
 	handler *CoreDNSMySql
 }
 
 type ARecord struct {
-	Ip  net.IP `json:"ip"`
+	Ip net.IP `json:"ip"`
 }
 
 type AAAARecord struct {
-	Ip  net.IP `json:"ip"`
+	Ip net.IP `json:"ip"`
 }
 
 type TXTRecord struct {
@@ -60,7 +60,7 @@ type SOARecord struct {
 }
 
 type CAARecord struct {
-	Flag  uint8 `json:"flag"`
+	Flag  uint8  `json:"flag"`
 	Tag   string `json:"tag"`
 	Value string `json:"value"`
 }
@@ -80,7 +80,7 @@ func (rec *Record) AsARecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if aRec.Ip == nil {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 	r.A = aRec.Ip
 	return r, nil, nil
@@ -97,7 +97,7 @@ func (rec *Record) AsAAAARecord() (record dns.RR, extras []dns.RR, err error) {
 	var aRec *AAAARecord
 	err = json.Unmarshal([]byte(rec.Content), &aRec)
 	if err != nil {
-		return nil,nil, err
+		return nil, nil, err
 	}
 
 	if aRec.Ip == nil {
@@ -123,7 +123,7 @@ func (rec *Record) AsTXTRecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if len(aRec.Text) == 0 {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 
 	r.Txt = split255(aRec.Text)
@@ -145,7 +145,7 @@ func (rec *Record) AsCNAMERecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if len(aRec.Host) == 0 {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 	r.Target = dns.Fqdn(aRec.Host)
 	return r, nil, nil
@@ -166,7 +166,7 @@ func (rec *Record) AsNSRecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if len(aRec.Host) == 0 {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 
 	r.Ns = aRec.Host
@@ -192,7 +192,7 @@ func (rec *Record) AsMXRecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if len(aRec.Host) == 0 {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 
 	r.Mx = aRec.Host
@@ -220,7 +220,7 @@ func (rec *Record) AsSRVRecord() (record dns.RR, extras []dns.RR, err error) {
 	}
 
 	if len(aRec.Target) == 0 {
-		return nil, nil,nil
+		return nil, nil, nil
 	}
 
 	r.Target = aRec.Target
@@ -240,10 +240,10 @@ func (rec *Record) AsSOARecord() (record dns.RR, extras []dns.RR, err error) {
 
 	if aRec.Ns == "" {
 		r.Hdr = dns.RR_Header{
-			Name: dns.Fqdn(rec.fqdn()),
+			Name:   dns.Fqdn(rec.fqdn()),
 			Rrtype: dns.TypeSOA,
-			Class: dns.ClassINET,
-			Ttl: rec.minTtl(),
+			Class:  dns.ClassINET,
+			Ttl:    rec.minTtl(),
 		}
 		r.Ns = "ns1." + rec.Name
 		r.Mbox = "hostmaster." + rec.Name
@@ -253,10 +253,10 @@ func (rec *Record) AsSOARecord() (record dns.RR, extras []dns.RR, err error) {
 		r.Minttl = rec.minTtl()
 	} else {
 		r.Hdr = dns.RR_Header{
-			Name: dns.Fqdn(rec.Zone),
+			Name:   dns.Fqdn(rec.Zone),
 			Rrtype: dns.TypeSOA,
-			Class: dns.ClassINET,
-			Ttl: rec.minTtl(),
+			Class:  dns.ClassINET,
+			Ttl:    rec.minTtl(),
 		}
 		r.Ns = aRec.Ns
 		r.Mbox = aRec.MBox
@@ -284,8 +284,8 @@ func (rec *Record) AsCAARecord() (record dns.RR, extras []dns.RR, err error) {
 		return nil, nil, err
 	}
 
-	if aRec.Value == "" || aRec.Tag == ""{
-		return nil, nil,nil
+	if aRec.Value == "" || aRec.Tag == "" {
+		return nil, nil, nil
 	}
 
 	r.Flag = aRec.Flag
@@ -328,4 +328,4 @@ func split255(s string) []string {
 
 func (rec *Record) fqdn() string {
 	return rec.Zone + rec.Name
-}
+}