keep the good bits

cmd/keytransparency-sequencer/main.go

@@ -170,7 +170,6 @@ func main() {
 	grpc_prometheus.Register(grpcServer)
 	grpc_prometheus.EnableHandlingTimeHistogram()
 
-	// Run servers
 	g, gctx := errgroup.WithContext(ctx)
 	g.Go(func() error { return serverutil.ServeHTTPMetrics(*metricsAddr, serverutil.Readyz(sqldb)) })
 	g.Go(func() error {
@@ -179,7 +178,7 @@ func main() {
 	})
 	go runSequencer(gctx, conn, directoryStorage)
 
-	glog.Errorf("Signer exiting: %v", g.Wait())
+	glog.Errorf("Sequencer exiting: %v", g.Wait())
 }
 
 func runSequencer(ctx context.Context, conn *grpc.ClientConn, directoryStorage dir.Storage) {

cmd/keytransparency-server/main.go

@@ -23,7 +23,6 @@ import (
 	"github.com/google/trillian/monitoring/prometheus"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/reflection"
 
 	"github.com/google/keytransparency/cmd/serverutil"
@@ -67,11 +66,6 @@ func main() {
 	}
 	defer sqldb.Close()
 
-	creds, err := credentials.NewServerTLSFromFile(*certFile, *keyFile)
-	if err != nil {
-		glog.Exitf("Failed to load server credentials %v", err)
-	}
-
 	authz := &authorization.AuthzPolicy{}
 	var authFunc grpc_auth.AuthFunc
 	switch *authType {
@@ -115,7 +109,6 @@ func main() {
 	ksvr := keyserver.New(tlog, tmap, entry.IsValidEntry, directories, logs, logs,
 		prometheus.MetricFactory{}, int32(*revisionPageSize))
 	grpcServer := grpc.NewServer(
-		grpc.Creds(creds),
 		grpc.StreamInterceptor(grpc_middleware.ChainStreamServer(
 			grpc_prometheus.StreamServerInterceptor,
 			authorization.StreamServerInterceptor(map[string]authorization.AuthPair{

cmd/serverutil/healthz.go

@@ -21,7 +21,7 @@ func Healthz() http.HandlerFunc { return healthz }
 
 func healthz(w http.ResponseWriter, _ *http.Request) {
 	w.WriteHeader(http.StatusOK)
-	w.Write([]byte("ok"))
+	w.Write([]byte("ok\n"))
 }
 
 // RootHeaalthHandler handles liveness checks at "/".

cmd/serverutil/readyz.go

@@ -27,5 +27,6 @@ func Readyz(db *sql.DB) http.HandlerFunc {
 			return
 		}
 		w.WriteHeader(http.StatusOK)
+		w.Write([]byte("ok\n"))
 	}
 }