This commit is contained in:
Martin Polden
2018-02-11 11:19:50 +01:00
parent 5d43f175d4
commit d49f1f7376
4 changed files with 22 additions and 38 deletions

View File

@ -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)