diff options
Diffstat (limited to 'http/http_test.go')
| -rw-r--r-- | http/http_test.go | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/http/http_test.go b/http/http_test.go index 0d43b46..7853b16 100644 --- a/http/http_test.go +++ b/http/http_test.go @@ -2,6 +2,7 @@ package http import ( "io/ioutil" + "log" "net" "net/http" "net/http/httptest" @@ -11,7 +12,7 @@ import ( "github.com/miekg/dns" "github.com/mpolden/zdns/cache" - "github.com/mpolden/zdns/log" + "github.com/mpolden/zdns/sql" ) func newA(name string, ttl uint32, ipAddr ...net.IP) *dns.Msg { @@ -30,12 +31,14 @@ func newA(name string, ttl uint32, ipAddr ...net.IP) *dns.Msg { } func testServer() (*httptest.Server, *Server) { - logger, err := log.New(ioutil.Discard, "", log.RecordOptions{Mode: log.ModeAll, Database: ":memory:"}) + db, err := sql.New(":memory:") if err != nil { panic(err) } + stdLogger := log.New(ioutil.Discard, "", 0) + logger := sql.NewLogger(db, sql.LogAll, 0) cache := cache.New(10, nil) - server := Server{logger: logger, cache: cache} + server := Server{logger: stdLogger, sqlLogger: logger, cache: cache} return httptest.NewServer(server.handler()), &server } @@ -76,9 +79,9 @@ func httpDelete(url, body string) (*http.Response, string, error) { func TestRequests(t *testing.T) { httpSrv, srv := testServer() defer httpSrv.Close() - srv.logger.Record(net.IPv4(127, 0, 0, 42), false, 1, "example.com.", "192.0.2.100", "192.0.2.101") - srv.logger.Record(net.IPv4(127, 0, 0, 254), true, 28, "example.com.", "2001:db8::1") - srv.logger.Close() // Flush + srv.sqlLogger.Record(net.IPv4(127, 0, 0, 42), false, 1, "example.com.", "192.0.2.100", "192.0.2.101") + srv.sqlLogger.Record(net.IPv4(127, 0, 0, 254), true, 28, "example.com.", "2001:db8::1") + srv.sqlLogger.Close() // Flush srv.cache.Set(1, newA("1.example.com.", 60, net.IPv4(192, 0, 2, 200))) srv.cache.Set(2, newA("2.example.com.", 30, net.IPv4(192, 0, 2, 201))) |