wberube
/
echoip
mirror of https://github.com/mpolden/echoip
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove logrus

This commit is contained in:
Martin Polden 2018-03-18 23:12:00 +01:00
parent 1efde17791
commit 055496906d
2 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ipd/main.go
View File

@ -1,6 +1,8 @@
package main package main
import ( import (
"log"
flags "github.com/jessevdk/go-flags" flags "github.com/jessevdk/go-flags"
"os" "os"
@ -8,7 +10,6 @@ import (
"github.com/mpolden/ipd/http" "github.com/mpolden/ipd/http"
"github.com/mpolden/ipd/iputil" "github.com/mpolden/ipd/iputil"
"github.com/mpolden/ipd/iputil/database" "github.com/mpolden/ipd/iputil/database"
"github.com/sirupsen/logrus"
) )
func main() { func main() {
@ -20,26 +21,19 @@ func main() {
PortLookup bool `short:"p" long:"port-lookup" description:"Enable port lookup"` PortLookup bool `short:"p" long:"port-lookup" description:"Enable port lookup"`
Template string `short:"t" long:"template" description:"Path to template" default:"index.html" value-name:"FILE"` Template string `short:"t" long:"template" description:"Path to template" default:"index.html" value-name:"FILE"`
IPHeader string `short:"H" long:"trusted-header" description:"Header to trust for remote IP, if present (e.g. X-Real-IP)" value-name:"NAME"` IPHeader string `short:"H" long:"trusted-header" description:"Header to trust for remote IP, if present (e.g. X-Real-IP)" value-name:"NAME"`
LogLevel string `short:"L" long:"log-level" description:"Log level to use" default:"info" choice:"debug" choice:"info" choice:"warn" choice:"error" choice:"fatal" choice:"panic"`
} }
_, err := flags.ParseArgs(&opts, os.Args) _, err := flags.ParseArgs(&opts, os.Args)
if err != nil { if err != nil {
os.Exit(1) os.Exit(1)
} }
log := logrus.New() log := log.New(os.Stderr, "ipd: ", 0)
level, err := logrus.ParseLevel(opts.LogLevel)
if err != nil {
log.Fatal(err)
}
log.Level = level
db, err := database.New(opts.CountryDBPath, opts.CityDBPath) db, err := database.New(opts.CountryDBPath, opts.CityDBPath)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
server := http.New(db, log) server := http.New(db)
server.Template = opts.Template server.Template = opts.Template
server.IPHeader = opts.IPHeader server.IPHeader = opts.IPHeader
if opts.ReverseLookup { if opts.ReverseLookup {

21
http/http.go
View File

@ -9,7 +9,6 @@ import (
"github.com/mpolden/ipd/iputil" "github.com/mpolden/ipd/iputil"
"github.com/mpolden/ipd/iputil/database" "github.com/mpolden/ipd/iputil/database"
"github.com/mpolden/ipd/useragent" "github.com/mpolden/ipd/useragent"
"github.com/sirupsen/logrus"
"net" "net"
"net/http" "net/http"
@ -28,7 +27,6 @@ type Server struct {
LookupAddr func(net.IP) ([]string, error) LookupAddr func(net.IP) ([]string, error)
LookupPort func(net.IP, uint64) error LookupPort func(net.IP, uint64) error
db database.Client db database.Client
log *logrus.Logger
} }
type Response struct { type Response struct {
@ -46,8 +44,8 @@ type PortResponse struct {
Reachable bool `json:"reachable"` Reachable bool `json:"reachable"`
} }
func New(db database.Client, log *logrus.Logger) *Server { func New(db database.Client) *Server {
return &Server{db: db, log: log} return &Server{db: db}
} }
func ipFromRequest(header string, r *http.Request) (net.IP, error) { func ipFromRequest(header string, r *http.Request) (net.IP, error) {
@ -72,20 +70,11 @@ func (s *Server) newResponse(r *http.Request) (Response, error) {
return Response{}, err return Response{}, err
} }
ipDecimal := iputil.ToDecimal(ip) ipDecimal := iputil.ToDecimal(ip)
country, err := s.db.Country(ip) country, _ := s.db.Country(ip)
if err != nil { city, _ := s.db.City(ip)
s.log.Debug(err)
}
city, err := s.db.City(ip)
if err != nil {
s.log.Debug(err)
}
var hostnames []string var hostnames []string
if s.LookupAddr != nil { if s.LookupAddr != nil {
h, err := s.LookupAddr(ip) h, _ := s.LookupAddr(ip)
if err != nil {
s.log.Debug(err)
}
hostnames = h hostnames = h
} }
return Response{ return Response{