compiles, untested

Makefile

@@ -7,7 +7,8 @@ prep:
 self:   prep rmdeps
 	if test -d src; then rm -rf src; fi
 	cp -r vendor src
-	mkdir -p src/github.com/whosonfirst/go-whosonfirst-libpostal/http
+	mkdir -p src/github.com/whosonfirst/go-whosonfirst-libpostal
+	cp -r http src/github.com/whosonfirst/go-whosonfirst-libpostal/
 
 rmdeps:
 	if test -d src; then rm -rf src; fi 
@@ -19,6 +20,7 @@ deps:	rmdeps
 	@GOPATH=$(GOPATH) go get -u "github.com/openvenues/gopostal/expand"
 	@GOPATH=$(GOPATH) go get -u "github.com/openvenues/gopostal/parser"
 	@GOPATH=$(GOPATH) go get -u "github.com/whosonfirst/go-sanitize"
+	@GOPATH=$(GOPATH) go get -u "github.com/whosonfirst/go-whosonfirst-log"
 
 vendor-deps: deps
 	if test -d vendor; then rm -rf vendor; fi

cmd/wof-libpostal-server.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+       "flag"
 	"fmt"
 	"github.com/facebookgo/grace/gracehttp"
 	"github.com/whosonfirst/go-whosonfirst-libpostal/http"
 	"github.com/whosonfirst/go-whosonfirst-log"
+	gohttp "net/http"
 	"os"
 )
 
@@ -15,33 +17,35 @@ func main() {
 
 	flag.Parse()
 
-	parser_hander, err := http.ParserHandler()
+	logger := log.SimpleWOFLogger()
+
+	parser_handler, err := http.ParserHandler()
 
 	if err != nil {
 		logger.Fatal("failed to create parser handler, because %v", err)
 	}
 
-	expand_hander, err := http.ExpandHandler()
+	expand_handler, err := http.ExpandHandler()
 
 	if err != nil {
 		logger.Fatal("failed to create expand handler, because %v", err)
 	}
 
-	ping_hander, err := http.PingHandler()
+	ping_handler, err := http.PingHandler()
 
 	if err != nil {
 		logger.Fatal("failed to create ping handler, because %v", err)
 	}
 
 	endpoint := fmt.Sprintf("%s:%d", *host, *port)
 
-	mux := http.NewServeMux()
+	mux := gohttp.NewServeMux()
 
-	mux.HandleFunc("/parse", parser_handler)
-	mux.HandleFunc("/expand", expand_handler)
-	mux.HandleFunc("/ping", ping_handler)	
+	mux.Handle("/parse", parser_handler)
+	mux.Handle("/expand", expand_handler)
+	mux.Handle("/ping", ping_handler)	
 
-	err := gracehttp.Serve(&http.Server{Addr: endpoint, Handler: mux})
+	err = gracehttp.Serve(&gohttp.Server{Addr: endpoint, Handler: mux})
 
 	if err != nil {
 		logger.Fatal("failed to start HTTP server, because %v", err)

http/common.go

@@ -2,7 +2,6 @@ package http
 
 import (
 	"encoding/json"
-	"github.com/facebookgo/grace/gracehttp"
 	"github.com/whosonfirst/go-sanitize"
 	gohttp "net/http"
 	"strings"

http/expand.go

@@ -9,14 +9,14 @@ func ExpandHandler() (gohttp.Handler, error) {
 
 	fn := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
 
-		address, err := GetAddress(r)
+		address, err := GetAddress(req)
 
 		if err != nil {
 			gohttp.Error(rsp, err.Error(), err.Code)
 			return
 		}
 
-		expansions := expand.ExpandAddress(address)
+		expansions := postal.ExpandAddress(address)
 		WriteResponse(rsp, expansions)
 	}
 

http/expvar.go

@@ -1,5 +1,12 @@
 package http
 
+import (
+       "expvar"
+       "fmt"
+       gohttp "net/http"
+       "strings"
+)
+
 var (
 	readErrors    *expvar.Int
 	marshalErrors *expvar.Int
@@ -41,7 +48,7 @@ func init() {
 
 func ExpvarHandler(host string) (gohttp.Handler, error) {
 
-	f := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
+	fn := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
 
 		remote := strings.Split(req.RemoteAddr, ":")
 
@@ -70,7 +77,7 @@ func ExpvarHandler(host string) (gohttp.Handler, error) {
 		expvar.Do(func(kv expvar.KeyValue) {
 
 			if !first {
-				fmt.Fprintf(w, ",\n")
+				fmt.Fprintf(rsp, ",\n")
 			}
 
 			first = false

http/parser.go

@@ -5,18 +5,18 @@ import (
 	gohttp "net/http"
 )
 
-func ExpandHandler() (gohttp.Handler, error) {
+func ParserHandler() (gohttp.Handler, error) {
 
 	fn := func(rsp gohttp.ResponseWriter, req *gohttp.Request) {
 
 		address, err := GetAddress(req)
 
 		if err != nil {
-			gohttp.Error(w, err.Error(), err.Code)
+			gohttp.Error(rsp, err.Error(), err.Code)
 			return
 		}
 
-		parsed := parser.ParseAddress(address)
+		parsed := postal.ParseAddress(address)
 
 		query := req.URL.Query()
 
@@ -31,7 +31,7 @@ func ExpandHandler() (gohttp.Handler, error) {
 	return h, nil
 }
 
-func FormatParsed(parsed []parser.ParsedComponent) map[string][]string {
+func FormatParsed(parsed []postal.ParsedComponent) map[string][]string {
 
 	rsp := make(map[string][]string)