X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e5b9158fc357495fba2d110bf6eafa72b1ebe145..61a8873440a505d1483a04354b8d1f2089e76e39:/services/keepstore/keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 8267fd7f95..9033de8117 100644
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"log"
 	"net"
 	"net/http"
 	"os"
@@ -15,8 +14,8 @@ import (
 	"git.curoverse.com/arvados.git/sdk/go/config"
 	"git.curoverse.com/arvados.git/sdk/go/httpserver"
 	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	log "github.com/Sirupsen/logrus"
 	"github.com/coreos/go-systemd/daemon"
-	"github.com/ghodss/yaml"
 )
 
 // A Keep "block" is 64MB.
@@ -82,11 +81,6 @@ var KeepVM VolumeManager
 var pullq *WorkQueue
 var trashq *WorkQueue
 
-// TODO(twp): continue moving as much code as possible out of main
-// so it can be effectively tested. Esp. handling and postprocessing
-// of command line flags (identifying Keep volumes and initializing
-// permission arguments).
-
 func main() {
 	deprecated.beforeFlagParse(theConfig)
 
@@ -104,22 +98,19 @@ func main() {
 
 	deprecated.afterFlagParse(theConfig)
 
-	// TODO: Load config
 	err := config.LoadFile(theConfig, configPath)
 	if err != nil && (!os.IsNotExist(err) || configPath != defaultConfigPath) {
 		log.Fatal(err)
 	}
 
 	if *dumpConfig {
-		y, err := yaml.Marshal(theConfig)
-		if err != nil {
-			log.Fatal(err)
-		}
-		os.Stdout.Write(y)
-		os.Exit(0)
+		log.Fatal(config.DumpAndExit(theConfig))
 	}
 
 	err = theConfig.Start()
+	if err != nil {
+		log.Fatal(err)
+	}
 
 	if pidfile := theConfig.PIDFile; pidfile != "" {
 		f, err := os.OpenFile(pidfile, os.O_RDWR|os.O_CREATE, 0777)
@@ -153,10 +144,10 @@ func main() {
 	KeepVM = MakeRRVolumeManager(theConfig.Volumes)
 
 	// Middleware stack: logger, MaxRequests limiter, method handlers
-	http.Handle("/", &LoggingRESTRouter{
-		httpserver.NewRequestLimiter(theConfig.MaxRequests,
-			MakeRESTRouter()),
-	})
+	router := MakeRESTRouter()
+	limiter := httpserver.NewRequestLimiter(theConfig.MaxRequests, router)
+	router.limiter = limiter
+	http.Handle("/", &LoggingRESTRouter{router: limiter})
 
 	// Set up a TCP listener.
 	listener, err := net.Listen("tcp", theConfig.Listen)
@@ -195,10 +186,10 @@ func main() {
 	signal.Notify(term, syscall.SIGTERM)
 	signal.Notify(term, syscall.SIGINT)
 
-	if _, err := daemon.SdNotify("READY=1"); err != nil {
+	if _, err := daemon.SdNotify(false, "READY=1"); err != nil {
 		log.Printf("Error notifying init daemon: %v", err)
 	}
-	log.Println("listening at", listener.Addr)
+	log.Println("listening at", listener.Addr())
 	srv := &http.Server{}
 	srv.Serve(listener)
 }