Simplify

1 files changed, 9 insertions, 14 deletions

diff --git a/cmd/ipd/main.go b/cmd/ipd/main.go
index 453fdb1..3bf150a 100644
--- a/cmd/ipd/main.go
+++ b/cmd/ipd/main.go
@@ -34,31 +34,26 @@ func main() {
 	}
 	log.Level = level
 
-	db := database.Empty()
-	if opts.CountryDBPath != "" || opts.CityDBPath != "" {
-		db, err = database.New(opts.CountryDBPath, opts.CityDBPath)
-		if err != nil {
-			log.Fatal(err)
-		}
+	db, err := database.New(opts.CountryDBPath, opts.CityDBPath)
+	if err != nil {
+		log.Fatal(err)
 	}
-	var lookupAddr http.LookupAddr
-	var lookupPort http.LookupPort
+
+	server := http.New(db, log)
+	server.Template = opts.Template
+	server.IPHeader = opts.IPHeader
 	if opts.ReverseLookup {
 		log.Println("Enabling reverse lookup")
-		lookupAddr = iputil.LookupAddr
+		server.LookupAddr = iputil.LookupAddr
 	}
 	if opts.PortLookup {
 		log.Println("Enabling port lookup")
-		lookupPort = iputil.LookupPort
+		server.LookupPort = iputil.LookupPort
 	}
 	if opts.IPHeader != "" {
 		log.Printf("Trusting header %s to contain correct remote IP", opts.IPHeader)
 	}
 
-	server := http.New(db, lookupAddr, lookupPort, log)
-	server.Template = opts.Template
-	server.IPHeader = opts.IPHeader
-
 	log.Printf("Listening on http://%s", opts.Listen)
 	if err := server.ListenAndServe(opts.Listen); err != nil {
 		log.Fatal(err)