X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6e4e65cf3aae701c3e02a814329757e869a1d6d..4ed4b6554535849341673efb7f80392dd5fba946:/services/keepstore/keepstore.go diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go index 3fb86bc0f1..d82c7d0f7a 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,6 +14,7 @@ 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" ) @@ -114,6 +114,9 @@ func main() { } 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) @@ -148,8 +151,7 @@ func main() { // Middleware stack: logger, MaxRequests limiter, method handlers http.Handle("/", &LoggingRESTRouter{ - httpserver.NewRequestLimiter(theConfig.MaxRequests, - MakeRESTRouter()), + router: httpserver.NewRequestLimiter(theConfig.MaxRequests, MakeRESTRouter()), }) // Set up a TCP listener. @@ -189,7 +191,7 @@ 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())