X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f0e6212bbe6e34f6ac4e928a236e77cca852895d..47f2363638b5ad65cec9a96d372563c16bea2907:/services/health/main.go?ds=sidebyside

diff --git a/services/health/main.go b/services/health/main.go
index 3e089fa5a2..bc57d36d04 100644
--- a/services/health/main.go
+++ b/services/health/main.go
@@ -1,44 +1,29 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-	"net/http"
+	"context"
+	"os"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/health"
-	"git.curoverse.com/arvados.git/sdk/go/httpserver"
-	log "github.com/Sirupsen/logrus"
+	"git.arvados.org/arvados.git/lib/cmd"
+	"git.arvados.org/arvados.git/lib/service"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/health"
+	"github.com/prometheus/client_golang/prometheus"
 )
 
-func main() {
-	log.SetFormatter(&log.JSONFormatter{
-		TimestampFormat: "2006-01-02T15:04:05.000000000Z07:00",
-	})
-	cfg, err := arvados.GetConfig()
-	if err != nil {
-		log.Fatal(err)
-	}
-	clusterCfg, err := cfg.GetCluster("")
-	if err != nil {
-		log.Fatal(err)
-	}
-	nodeCfg, err := clusterCfg.GetThisSystemNode()
-	if err != nil {
-		log.Fatal(err)
-	}
+var (
+	version             = "dev"
+	command cmd.Handler = service.Command(arvados.ServiceNameHealth, newHandler)
+)
 
-	srv := &httpserver.Server{
-		Addr: nodeCfg.Health.Listen,
-		Server: http.Server{
-			Handler: &health.Aggregator{
-				Config: cfg,
-			},
-		},
-	}
-	if err := srv.Start(); err != nil {
-		log.Fatal(err)
-	}
-	log.WithField("Listen", srv.Addr).Info("listening")
-	if err := srv.Wait(); err != nil {
-		log.Fatal(err)
-	}
+func newHandler(ctx context.Context, cluster *arvados.Cluster, _ string, _ *prometheus.Registry) service.Handler {
+	return &health.Aggregator{Cluster: cluster}
+}
+
+func main() {
+	os.Exit(command.RunCommand(os.Args[0], os.Args[1:], os.Stdin, os.Stdout, os.Stderr))
 }