Move server to common.

Author: tomwilkie

cmd/distributor/main.go

@@ -7,9 +7,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 
+	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/cortex/distributor"
 	"github.com/weaveworks/cortex/ring"
-	"github.com/weaveworks/cortex/server"
 	"github.com/weaveworks/cortex/util"
 )
 
@@ -32,7 +32,9 @@ func main() {
 	//   object.
 
 	var (
-		serverConfig      server.Config
+		serverConfig = server.Config{
+			MetricsNamespace: "cortex",
+		}
 		ringConfig        ring.Config
 		distributorConfig distributor.Config
 	)
@@ -52,7 +54,8 @@ func main() {
 	defer dist.Stop()
 	prometheus.MustRegister(dist)
 
-	server := server.New(serverConfig, r)
+	server := server.New(serverConfig)
+	server.HTTP.Handle("/ring", r)
 	server.HTTP.Handle("/api/prom/push", http.HandlerFunc(dist.PushHandler))
 	defer server.Stop()
 

cmd/ingester/main.go

@@ -7,17 +7,19 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 
+	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/cortex"
 	"github.com/weaveworks/cortex/chunk"
 	"github.com/weaveworks/cortex/ingester"
 	"github.com/weaveworks/cortex/ring"
-	"github.com/weaveworks/cortex/server"
 	"github.com/weaveworks/cortex/util"
 )
 
 func main() {
 	var (
-		serverConfig               server.Config
+		serverConfig = server.Config{
+			MetricsNamespace: "cortex",
+		}
 		ingesterRegistrationConfig ring.IngesterRegistrationConfig
 		chunkStoreConfig           chunk.StoreConfig
 		ingesterConfig             ingester.Config
@@ -33,7 +35,7 @@ func main() {
 	}
 	defer registration.Ring.Stop()
 
-	server := server.New(serverConfig, registration.Ring)
+	server := server.New(serverConfig)
 	chunkStore, err := chunk.NewStore(chunkStoreConfig)
 	if err != nil {
 		log.Fatal(err)
@@ -45,6 +47,7 @@ func main() {
 	}
 	prometheus.MustRegister(ingester)
 	cortex.RegisterIngesterServer(server.GRPC, ingester)
+	server.HTTP.Handle("/ring", registration.Ring)
 	server.HTTP.Path("/ready").Handler(http.HandlerFunc(ingester.ReadinessHandler))
 
 	// Deferring a func to make ordering obvious

cmd/querier/main.go

@@ -14,12 +14,12 @@ import (
 	"github.com/prometheus/prometheus/retrieval"
 	"github.com/prometheus/prometheus/web/api/v1"
 
+	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/common/user"
 	"github.com/weaveworks/cortex/chunk"
 	"github.com/weaveworks/cortex/distributor"
 	"github.com/weaveworks/cortex/querier"
 	"github.com/weaveworks/cortex/ring"
-	"github.com/weaveworks/cortex/server"
 	"github.com/weaveworks/cortex/util"
 )
 
@@ -33,7 +33,9 @@ func (r dummyAlertmanagerRetriever) Alertmanagers() []string { return nil }
 
 func main() {
 	var (
-		serverConfig      server.Config
+		serverConfig = server.Config{
+			MetricsNamespace: "cortex",
+		}
 		ringConfig        ring.Config
 		distributorConfig distributor.Config
 		chunkStoreConfig  chunk.StoreConfig
@@ -54,7 +56,8 @@ func main() {
 	defer dist.Stop()
 	prometheus.MustRegister(dist)
 
-	server := server.New(serverConfig, r)
+	server := server.New(serverConfig)
+	server.HTTP.Handle("/ring", r)
 	defer server.Stop()
 
 	chunkStore, err := chunk.NewStore(chunkStoreConfig)

cmd/ruler/main.go

@@ -6,17 +6,19 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/log"
 
+	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/cortex/chunk"
 	"github.com/weaveworks/cortex/distributor"
 	"github.com/weaveworks/cortex/ring"
 	"github.com/weaveworks/cortex/ruler"
-	"github.com/weaveworks/cortex/server"
 	"github.com/weaveworks/cortex/util"
 )
 
 func main() {
 	var (
-		serverConfig      server.Config
+		serverConfig = server.Config{
+			MetricsNamespace: "cortex",
+		}
 		ringConfig        ring.Config
 		distributorConfig distributor.Config
 		rulerConfig       ruler.Config
@@ -55,7 +57,8 @@ func main() {
 	}
 	defer rulerServer.Stop()
 
-	server := server.New(serverConfig, r)
+	server := server.New(serverConfig)
+	server.HTTP.Handle("/ring", r)
 	defer server.Stop()
 	server.Run()
 }

cmd/table-manager/main.go

@@ -5,21 +5,23 @@ import (
 
 	"github.com/prometheus/common/log"
 
+	"github.com/weaveworks/common/server"
 	"github.com/weaveworks/cortex/chunk"
-	"github.com/weaveworks/cortex/server"
 	"github.com/weaveworks/cortex/util"
 )
 
 func main() {
 	var (
-		serverConfig       = server.Config{}
+		serverConfig = server.Config{
+			MetricsNamespace: "cortex",
+		}
 		tableManagerConfig = chunk.TableManagerConfig{}
 	)
 	util.RegisterFlags(&serverConfig, &tableManagerConfig)
 	flag.Parse()
 
 	// Have to initialise server first, as its sets up tracing.
-	server := server.New(serverConfig, nil)
+	server := server.New(serverConfig)
 
 	tableManager, err := chunk.NewDynamoTableManager(tableManagerConfig)
 	if err != nil {

vendor/github.com/weaveworks/common/exec/exec.go

@@ -869,8 +869,8 @@
 			"importpath": "github.com/weaveworks/common",
 			"repository": "https://github.com/weaveworks/common",
 			"vcs": "git",
-			"revision": "ceec9d7f5c36c903ff37d06aaa34fd69621b08d7",
-			"branch": "master",
+			"revision": "db1ec394475d75bde9daeb6d221eb8ca75332b21",
+			"branch": "standard-server",
 			"notests": true
 		},
 		{