Merge pull request #7 from r7wx/develop

configurable blocklists update time

README.md

@@ -86,7 +86,6 @@ hosts:
     ip: 127.0.0.1
 
 # luna-dns supports blocklists both from local files or remote URI
-# each blocklist will be updated every 12 hours.
 # Blocklists must contain only one domain name per line.
 # Every blocked record resolves to 0.0.0.0
 # ex.
@@ -97,4 +96,7 @@ blocklists:
   - http://test.test/test.txt
   - file://folder/test.txt
   - file:///root/test.txt
+
+# blocklists update time (in minute)
+blocklists_update: 720 # 12 hours (default)
 ```

config.yml

@@ -14,3 +14,8 @@ hosts:
     ip: 127.0.0.1
   - host: "*.test.com"
     ip: 127.0.0.1
+#blocklists:
+#  - http://test.test/test.txt
+#  - file://folder/test.txt
+#  - file:///root/test.txt
+#blocklists_update: 720

internal/blocklists/blocklists.go

@@ -8,21 +8,23 @@ import (
 	"github.com/r7wx/luna-dns/internal/tree"
 )
 
-const (
-	updateTime = 12 * time.Hour
-)
-
 // Blocklists - Blocklists strutct
 type Blocklists struct {
 	hosts      *tree.Tree
 	blocklists []string
+	updateTime int64
 }
 
 // NewBlocklists - Create a new Blocklists
-func NewBlocklists(blocklists []string) *Blocklists {
+func NewBlocklists(blocklists []string, updateTime int64) *Blocklists {
+	if updateTime == 0 {
+		updateTime = 720
+	}
+
 	return &Blocklists{
 		hosts:      tree.NewTree(),
 		blocklists: blocklists,
+		updateTime: updateTime,
 	}
 }
 
@@ -44,8 +46,9 @@ func (b *Blocklists) Routine() {
 			b.processRemote(blocklist, newHosts)
 		}
 		b.hosts = newHosts
-		log.Printf("Blocklists updated, next update in %s\n", updateTime)
+		log.Printf("Blocklists updated, next update in %d minutes\n",
+			b.updateTime)
 
-		time.Sleep(updateTime)
+		time.Sleep(time.Duration(b.updateTime * int64(time.Minute)))
 	}
 }

internal/blocklists/blocklists_test.go

@@ -12,7 +12,7 @@ import (
 
 func TestNewBlocklists(t *testing.T) {
 	blocklists := []string{"blocklist1", "blocklist2"}
-	b := NewBlocklists(blocklists)
+	b := NewBlocklists(blocklists, 1)
 	if b.hosts == nil {
 		t.Errorf("Expected hosts to be initialized")
 	}

internal/config/config.go

@@ -20,13 +20,14 @@ type DNS struct {
 
 // Config - Main configuration struct
 type Config struct {
-	Addr       string   `yaml:"addr"`
-	Network    string   `yaml:"network"`
-	LogFile    string   `yaml:"log_file"`
-	DNS        []DNS    `yaml:"dns"`
-	Hosts      []Host   `yaml:"hosts"`
-	Blocklists []string `yaml:"blocklists"`
-	CacheTTL   int64    `yaml:"cache_ttl"`
+	Addr            string   `yaml:"addr"`
+	Network         string   `yaml:"network"`
+	LogFile         string   `yaml:"log_file"`
+	DNS             []DNS    `yaml:"dns"`
+	Hosts           []Host   `yaml:"hosts"`
+	Blocklists      []string `yaml:"blocklists"`
+	BlocklistUpdate int64    `yaml:"blocklists_update"`
+	CacheTTL        int64    `yaml:"cache_ttl"`
 }
 
 // Load - Load configuration from file

internal/engine/engine.go

@@ -35,8 +35,9 @@ func NewEngine(config *config.Config) (*Engine, error) {
 	}
 
 	return &Engine{
-		Hosts:      Hosts,
-		Blocklists: blocklists.NewBlocklists(config.Blocklists),
+		Hosts: Hosts,
+		Blocklists: blocklists.NewBlocklists(config.Blocklists,
+			config.BlocklistUpdate),
 		cache: cache.NewCache(time.Duration(config.CacheTTL) *
 			time.Second),
 		addr:         config.Addr,
@@ -51,8 +52,7 @@ func (e *Engine) Start() error {
 	go e.Blocklists.Routine()
 	go e.cache.Routine()
 
-	log.Printf("Listening on %s (%s)\n", e.addr,
-		e.network)
+	log.Printf("Listening on %s (%s)\n", e.addr, e.network)
 
 	dns.HandleFunc(".", e.handler)
 	server := &dns.Server{Addr: e.addr, Net: e.network}