more better logging

cmd/wof-libpostal-server.go

@@ -1,7 +1,7 @@
 package main
 
 import (
-       "flag"
+	"flag"
 	"fmt"
 	"github.com/facebookgo/grace/gracehttp"
 	"github.com/whosonfirst/go-whosonfirst-libpostal/http"
@@ -19,13 +19,13 @@ func main() {
 
 	logger := log.SimpleWOFLogger()
 
-	parser_handler, err := http.ParserHandler()
+	parser_handler, err := http.ParserHandler(logger)
 
 	if err != nil {
 		logger.Fatal("failed to create parser handler, because %v", err)
 	}
 
-	expand_handler, err := http.ExpandHandler()
+	expand_handler, err := http.ExpandHandler(logger)
 
 	if err != nil {
 		logger.Fatal("failed to create expand handler, because %v", err)
@@ -38,12 +38,13 @@ func main() {
 	}
 
 	endpoint := fmt.Sprintf("%s:%d", *host, *port)
+	logger.Status("listening on %s", endpoint)
 
 	mux := gohttp.NewServeMux()
-	
+
 	mux.Handle("/parse", parser_handler)
 	mux.Handle("/expand", expand_handler)
-	mux.Handle("/ping", ping_handler)	
+	mux.Handle("/ping", ping_handler)
 
 	err = gracehttp.Serve(&gohttp.Server{Addr: endpoint, Handler: mux})
 

http/expand.go

@@ -2,10 +2,12 @@ package http
 
 import (
 	"github.com/openvenues/gopostal/expand"
+	"github.com/whosonfirst/go-whosonfirst-log"
 	gohttp "net/http"
+	"time"
 )
 
-func ExpandHandler() (gohttp.Handler, error) {
+func ExpandHandler(logger *log.WOFLogger) (gohttp.Handler, error) {
 
 	fn := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
 
@@ -16,6 +18,13 @@ func ExpandHandler() (gohttp.Handler, error) {
 			return
 		}
 
+		t1 := time.Now()
+
+		defer func() {
+			t2 := time.Since(t1)
+			logger.Status("expand '%s' %v", address, t2)
+		}()
+
 		expansions := postal.ExpandAddress(address)
 		WriteResponse(rsp, expansions)
 	}

http/expvar.go

@@ -1,10 +1,10 @@
 package http
 
 import (
-       "expvar"
-       "fmt"
-       gohttp "net/http"
-       "strings"
+	"expvar"
+	"fmt"
+	gohttp "net/http"
+	"strings"
 )
 
 var (

http/parser.go

@@ -2,10 +2,12 @@ package http
 
 import (
 	"github.com/openvenues/gopostal/parser"
+	"github.com/whosonfirst/go-whosonfirst-log"
 	gohttp "net/http"
+	"time"
 )
 
-func ParserHandler() (gohttp.Handler, error) {
+func ParserHandler(logger *log.WOFLogger) (gohttp.Handler, error) {
 
 	fn := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
 
@@ -16,6 +18,13 @@ func ParserHandler() (gohttp.Handler, error) {
 			return
 		}
 
+		t1 := time.Now()
+
+		defer func() {
+			t2 := time.Since(t1)
+			logger.Status("parse '%s' %v", address, t2)
+		}()
+
 		parsed := postal.ParseAddress(address)
 
 		query := req.URL.Query()