projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10473-keepstore-logrus' closes #10473
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 69ff5659c15536d056dc448a72a0d33f0d1eca32..d82c7d0f7a78792b4ccd46558e5ccb159ae463e4 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-3,7
+3,6
@@
package main
import (
"flag"
"fmt"
import (
"flag"
"fmt"
- "log"
"net"
"net/http"
"os"
"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"
"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"
)
"github.com/coreos/go-systemd/daemon"
"github.com/ghodss/yaml"
)
@@
-82,11
+82,6
@@
var KeepVM VolumeManager
var pullq *WorkQueue
var trashq *WorkQueue
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)
func main() {
deprecated.beforeFlagParse(theConfig)
@@
-119,6
+114,9
@@
func main() {
}
err = theConfig.Start()
}
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)
if pidfile := theConfig.PIDFile; pidfile != "" {
f, err := os.OpenFile(pidfile, os.O_RDWR|os.O_CREATE, 0777)
@@
-153,8
+151,7
@@
func main() {
// Middleware stack: logger, MaxRequests limiter, method handlers
http.Handle("/", &LoggingRESTRouter{
// 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.
})
// Set up a TCP listener.
@@
-194,10
+191,10
@@
func main() {
signal.Notify(term, syscall.SIGTERM)
signal.Notify(term, syscall.SIGINT)
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.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)
}
srv := &http.Server{}
srv.Serve(listener)
}