neater logging

liamg · Jun 19, 2019 · 1ac36e6 · 1ac36e6
1 parent 7b16fad
commit 1ac36e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/internal/app/philter/server/cache.go b/internal/app/philter/server/cache.go
@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/miekg/dns"
-	log "github.com/sirupsen/logrus"
 )
 
 type Cache struct {
@@ -44,7 +43,6 @@ func (c *Cache) cleanse() {
 	for key, val := range c.cache {
 		if now.After(val.expires) {
 			c.lock.Lock()
-			log.Infof("Removing expired item from cache: %s", key)
 			delete(c.cache, key)
 			c.lock.Unlock()
 		}

diff --git a/internal/app/philter/server/server.go b/internal/app/philter/server/server.go
@@ -66,7 +66,7 @@ func (s *Server) handleQuery(m *dns.Msg) {
 
 		answer, found := s.cache.Read(q)
 		if found {
-			log.Printf("Query for %s returned from cache", q.Name)
+			log.Printf("cache <- %s ", q.Name)
 			m.Answer = answer
 			continue
 		}
@@ -75,7 +75,7 @@ func (s *Server) handleQuery(m *dns.Msg) {
 			if s.blacklist != nil && s.blacklist.Includes(q.Name) {
 				rr, err := dns.NewRR(fmt.Sprintf("%s A 127.0.0.1", q.Name))
 				if err == nil {
-					log.Printf("Query for %s blocked", q.Name)
+					log.Printf("block <- %s", q.Name)
 					m.Answer = append(m.Answer, rr)
 					continue
 				}
@@ -84,7 +84,7 @@ func (s *Server) handleQuery(m *dns.Msg) {
 			if s.blacklist != nil && s.blacklist.Includes(q.Name) {
 				rr, err := dns.NewRR(fmt.Sprintf("%s AAAA ::1", q.Name))
 				if err == nil {
-					log.Printf("Query for %s blocked", q.Name)
+					log.Printf("block <- %s", q.Name)
 					m.Answer = append(m.Answer, rr)
 					continue
 				}
@@ -107,7 +107,7 @@ func (s *Server) handleQuery(m *dns.Msg) {
 			return
 		}
 
-		log.Printf("Query for %s allowed", q.Name)
+		log.Printf("allow <- %s", q.Name)
 		m.Answer = r.Answer
 		go s.cache.Write(q, r.Answer)
 	}