X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ae03057c03ca6b8543c93a4b3938ba06dad41571..70838209c214bfa57ef4bce289e1530a1cc2b081:/services/keep-balance/server.go

diff --git a/services/keep-balance/server.go b/services/keep-balance/server.go
index 3e665a30d5..9801a3fd45 100644
--- a/services/keep-balance/server.go
+++ b/services/keep-balance/server.go
@@ -8,14 +8,10 @@ import (
 	"net/http"
 	"os"
 	"os/signal"
-	"sync"
 	"syscall"
 	"time"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/auth"
-	"github.com/julienschmidt/httprouter"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"github.com/sirupsen/logrus"
 )
 
@@ -41,48 +37,25 @@ type RunOptions struct {
 }
 
 type Server struct {
+	http.Handler
+
 	Cluster    *arvados.Cluster
 	ArvClient  *arvados.Client
 	RunOptions RunOptions
 	Metrics    *metrics
 
-	httpHandler http.Handler
-	setupOnce   sync.Once
-
 	Logger logrus.FieldLogger
 	Dumper logrus.FieldLogger
 }
 
-// ServeHTTP implements service.Handler.
-func (srv *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	srv.httpHandler.ServeHTTP(w, r)
-}
-
 // CheckHealth implements service.Handler.
 func (srv *Server) CheckHealth() error {
 	return nil
 }
 
-// Start sets up and runs the balancer.
-func (srv *Server) Start() {
-	srv.setupOnce.Do(srv.setup)
-	go srv.run()
-}
-
-func (srv *Server) setup() {
-	if srv.Cluster.ManagementToken == "" {
-		srv.httpHandler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			http.Error(w, "Management API authentication is not configured", http.StatusForbidden)
-		})
-	} else {
-		mux := httprouter.New()
-		metricsH := promhttp.HandlerFor(srv.Metrics.reg, promhttp.HandlerOpts{
-			ErrorLog: srv.Logger,
-		})
-		mux.Handler("GET", "/metrics", metricsH)
-		mux.Handler("GET", "/metrics.json", metricsH)
-		srv.httpHandler = auth.RequireLiteralToken(srv.Cluster.ManagementToken, mux)
-	}
+// Done implements service.Handler.
+func (srv *Server) Done() <-chan struct{} {
+	return nil
 }
 
 func (srv *Server) run() {
@@ -94,6 +67,9 @@ func (srv *Server) run() {
 	}
 	if err != nil {
 		srv.Logger.Error(err)
+		os.Exit(1)
+	} else {
+		os.Exit(0)
 	}
 }