Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk

[arvados.git] / services / health / main.go

diff --git a/services/health/main.go b/services/health/main.go
index 3e089fa5a229966dd79f410bbc3e56605f26b4bd..496fb884d433a5eea350d27818d5e72629e9242f 100644 (file)
--- a/services/health/main.go
+++ b/services/health/main.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+       "flag"
+       "fmt"
        "net/http"
 
        "git.curoverse.com/arvados.git/sdk/go/arvados"
@@ -9,11 +11,25 @@ import (
        log "github.com/Sirupsen/logrus"
 )
 
+var version = "dev"
+
 func main() {
+       configFile := flag.String("config", arvados.DefaultConfigFile, "`path` to arvados configuration file")
+       getVersion := flag.Bool("version", false, "Print version information and exit.")
+       flag.Parse()
+
+       // Print version information if requested
+       if *getVersion {
+               fmt.Printf("arvados-health %s\n", version)
+               return
+       }
+
        log.SetFormatter(&log.JSONFormatter{
                TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
        })
-       cfg, err := arvados.GetConfig()
+       log.Printf("arvados-health %s started", version)
+
+       cfg, err := arvados.GetConfig(*configFile)
        if err != nil {
                log.Fatal(err)
        }
@@ -26,11 +42,18 @@ func main() {
                log.Fatal(err)
        }
 
+       log := log.WithField("Service", "Health")
        srv := &httpserver.Server{
                Addr: nodeCfg.Health.Listen,
                Server: http.Server{
                        Handler: &health.Aggregator{
                                Config: cfg,
+                               Log: func(req *http.Request, err error) {
+                                       log.WithField("RemoteAddr", req.RemoteAddr).
+                                               WithField("Path", req.URL.Path).
+                                               WithError(err).
+                                               Info("HTTP request")
+                               },
                        },
                },
        }