From 7c132313f5ac026bb8af1f5e3da07564d144ba17 Mon Sep 17 00:00:00 2001 From: Daniel Langesten Date: Thu, 19 Mar 2015 09:55:47 +0100 Subject: improved logging --- cleaner.go | 2 -- whois.go | 12 ++++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cleaner.go b/cleaner.go index 97ab72a..7601766 100644 --- a/cleaner.go +++ b/cleaner.go @@ -148,12 +148,10 @@ func clean(rDat []RawData, cfg *Config) (cDat []cleanedData, err error) { iplist = append(iplist, ip) } - log.Println("Querying for ip-blocks...") pairs, err := findIPBlock(iplist...) if err != nil { return } - log.Println("ip-blocks returned") for _, rd := range rDat { var tim time.Time diff --git a/whois.go b/whois.go index 3d75477..751a5d1 100644 --- a/whois.go +++ b/whois.go @@ -2,7 +2,9 @@ package main import ( "io/ioutil" + "log" "net" + "os" "strings" "time" ) @@ -14,6 +16,14 @@ const ( RETRIES = 2 ) +var ( + log *log.Logger +) + +func init() { + logger = log.New(os.Stdout, "[ Whois ]", log.LstdFlags) +} + /* func main() { pairs, err := findIPBlock("130.229.137.105", "192.88.99.1") @@ -25,6 +35,7 @@ func main() { */ func findIPBlock(domains ...string) (pairs map[string]string, err error) { + logger.Println("Querying for ip-blocks...") if len(domains) == 0 { return } @@ -50,6 +61,7 @@ func findIPBlock(domains ...string) (pairs map[string]string, err error) { ipb := strings.TrimSpace(content[2]) pairs[ipaddr] = ipb } + logger.Println("ip-blocks returned") return } -- cgit v1.1