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

Use logrus for logging

This commit is contained in:
Martin Polden 2016-08-13 20:32:19 +02:00
parent c7668386de
commit 36fba6ff54
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/api.go
View File

@ -5,7 +5,9 @@ import (
"fmt" "fmt"
"html/template" "html/template"
"io" "io"
"log"
"github.com/Sirupsen/logrus"
"math/big" "math/big"
"net" "net"
"net/http" "net/http"
@ -27,6 +29,7 @@ type API struct {
Template string Template string
IPHeader string IPHeader string
oracle Oracle oracle Oracle
log *logrus.Logger
} }
type Response struct { type Response struct {
@ -43,8 +46,8 @@ type PortResponse struct {
Reachable bool `json:"reachable"` Reachable bool `json:"reachable"`
} }
func New(oracle Oracle) *API { func New(oracle Oracle, logger *logrus.Logger) *API {
return &API{oracle: oracle} return &API{oracle: oracle, log: logger}
} }
func ipToDecimal(ip net.IP) *big.Int { func ipToDecimal(ip net.IP) *big.Int {
@ -81,15 +84,15 @@ func (a *API) newResponse(r *http.Request) (Response, error) {
ipDecimal := ipToDecimal(ip) ipDecimal := ipToDecimal(ip)
country, err := a.oracle.LookupCountry(ip) country, err := a.oracle.LookupCountry(ip)
if err != nil { if err != nil {
log.Print(err) a.log.Debug(err)
} }
city, err := a.oracle.LookupCity(ip) city, err := a.oracle.LookupCity(ip)
if err != nil { if err != nil {
log.Print(err) a.log.Debug(err)
} }
hostnames, err := a.oracle.LookupAddr(ip) hostnames, err := a.oracle.LookupAddr(ip)
if err != nil { if err != nil {
log.Print(err) a.log.Debug(err)
} }
return Response{ return Response{
IP: ip, IP: ip,
@ -211,9 +214,6 @@ type appHandler func(http.ResponseWriter, *http.Request) *appError
func (fn appHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (fn appHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if e := fn(w, r); e != nil { // e is *appError if e := fn(w, r); e != nil { // e is *appError
if e.Error != nil {
log.Print(e.Error)
}
// When Content-Type for error is JSON, we need to marshal the response into JSON // When Content-Type for error is JSON, we need to marshal the response into JSON
if e.IsJSON() { if e.IsJSON() {
var data = struct { var data = struct {

13
main.go
View File

@ -3,9 +3,10 @@ package main
import ( import (
flags "github.com/jessevdk/go-flags" flags "github.com/jessevdk/go-flags"
"log"
"os" "os"
"github.com/Sirupsen/logrus"
"github.com/martinp/ipd/api" "github.com/martinp/ipd/api"
) )
@ -18,12 +19,20 @@ 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"` Template string `short:"t" long:"template" description:"Path to template" default:"index.html"`
IPHeader string `short:"H" long:"trusted-header" description:"Header to trust for remote IP, if present (e.g. X-Real-IP)"` IPHeader string `short:"H" long:"trusted-header" description:"Header to trust for remote IP, if present (e.g. X-Real-IP)"`
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()
level, err := logrus.ParseLevel(opts.LogLevel)
if err != nil {
log.Fatal(err)
}
log.Level = level
oracle := api.NewOracle() oracle := api.NewOracle()
if opts.ReverseLookup { if opts.ReverseLookup {
log.Println("Enabling reverse lookup") log.Println("Enabling reverse lookup")
@ -49,7 +58,7 @@ func main() {
log.Printf("Trusting header %s to contain correct remote IP", opts.IPHeader) log.Printf("Trusting header %s to contain correct remote IP", opts.IPHeader)
} }
api := api.New(oracle) api := api.New(oracle, log)
api.Template = opts.Template api.Template = opts.Template
api.IPHeader = opts.IPHeader api.IPHeader = opts.IPHeader