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

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 4eaaea8ea3..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.
@@ -105,12 +104,7 @@ func main() {
 	}
 
 	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()
@@ -150,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)