keyserver: add commandline options for database and listenaddress

cmd/keyserver/keyserver.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"log"
 	"math"
@@ -14,8 +15,6 @@ import (
 	geo "github.com/kellydunn/golang-geo"
 )
 
-var hoodDir string = "/home/fbl/Desktop/keyserver/hoods"
-
 func hoodVoronoi(hoods []Hood, lat, long float64) *Hood {
 	var best *Hood
 	var bestDist float64 = math.MaxFloat64
@@ -187,7 +186,7 @@ func keyserverV2Handler(hoods []Hood) http.Handler {
 	)
 }
 
-func parseHoods() ([]Hood, error) {
+func parseHoods(hoodDir string) ([]Hood, error) {
 	var newHoods []Hood
 	var err error
 
@@ -227,14 +226,19 @@ func blank(w http.ResponseWriter, r *http.Request) {
 }
 
 func run() error {
-	hoods, err := parseHoods()
+	hoodDir := flag.String("hoods", "./hoods", "Directory of hood json files")
+	addr := flag.String("addr", ":8080", "HTTP listen addr")
+	flag.Parse()
+
+	hoods, err := parseHoods(*hoodDir)
 	if err != nil {
 		return err
 	}
 
 	http.Handle("/v2/", logRequestDuration(keyserverV2Handler(hoods)))
 	http.HandleFunc("/v2/hoods.php", blank)
-	return http.ListenAndServe(":8080", nil)
+	log.Printf("Starting HTTP Server on http://%s", *addr)
+	return http.ListenAndServe(*addr, nil)
 }
 
 func main() {