X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/91db2d8fd32bc3f6c2a26ffc37f6591b1e5f380b..6d7139a0e133bdbf780a358db198b14a2ded4b7c:/services/health/main.go

diff --git a/services/health/main.go b/services/health/main.go
index 7f4d6481e0..bc57d36d04 100644
--- a/services/health/main.go
+++ b/services/health/main.go
@@ -1,33 +1,29 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
-	"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"
+	"context"
+	"os"
+
+	"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",
-	})
-	sysConf, err := arvados.GetSystemConfig()
-	if err != nil {
-		log.Fatal(err)
-	}
+var (
+	version             = "dev"
+	command cmd.Handler = service.Command(arvados.ServiceNameHealth, newHandler)
+)
 
-	srv := &httpserver.Server{
-		Addr: ":", // FIXME: should be dictated by Health on this SystemNode
-		Handler: &health.Aggregator{
-			SystemConfig: sysConf,
-		},
-	}
-	srv.HandleFunc()
-	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))
 }