fix metrics server

graphikDB · Dec 31, 2020 · 3d10b0d · 3d10b0d
1 parent cd80fdf
commit 3d10b0d
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.1.2
+current_version = 1.1.3
 commit = False
 tag = False
 

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-version := "1.1.2"
+version := "1.1.3"
 
 .DEFAULT_GOAL := help
 

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ https://graphikdb.github.io/graphik/
 
 `git clone [email protected]:graphikDB/graphik.git`
 
-`docker pull graphikdb/graphik:v1.1.2`
+`docker pull graphikdb/graphik:v1.1.3`
 
 Graphik is a Backend as a Service implemented as an identity-aware, permissioned, persistant document/graph database & pubsub server written in Go.
 
@@ -914,7 +914,7 @@ add this docker-compose.yml to ${pwd}:
     version: '3.7'
     services:
       graphik:
-        image: graphikdb/graphik:v1.1.2
+        image: graphikdb/graphik:v1.1.3
         env_file:
           - .env
         ports:

diff --git a/cmd/graphik/main.go b/cmd/graphik/main.go
@@ -200,7 +200,8 @@ func run(ctx context.Context, cfg *apipb.Flags) {
 	}
 	defer adminLis.Close()
 	adminMux := cmux.New(adminLis)
-
+	hmatcher := adminMux.Match(cmux.HTTP1(), cmux.HTTP1Fast())
+	defer hmatcher.Close()
 	raftLis := adminMux.Match(cmux.Any())
 	if tlsConfig != nil {
 		raftLis = tls.NewListener(raftLis, tlsConfig)
@@ -221,8 +222,7 @@ func run(ctx context.Context, cfg *apipb.Flags) {
 		router.HandleFunc("/debug/pprof/trace", pprof.Trace)
 		metricServer = &http.Server{Handler: router}
 	}
-	hmatcher := adminMux.Match(cmux.HTTP1())
-	defer hmatcher.Close()
+
 	m.Go(func(routine machine.Routine) {
 		lgger.Info("starting metrics/admin server", zap.String("address", hmatcher.Addr().String()))
 		if err := metricServer.Serve(hmatcher); err != nil && err != http.ErrServerClosed {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.7'
 services:
   graphik:
-    image: graphikdb/graphik:v1.1.2
+    image: graphikdb/graphik:v1.1.3
     env_file:
       - .env
     ports:

diff --git a/k8s.yaml b/k8s.yaml
@@ -91,7 +91,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
-          image: graphikdb/graphik:v1.1.2
+          image: graphikdb/graphik:v1.1.3
           imagePullPolicy: Always
           ports:
           - containerPort: 7821

diff --git a/version/version.go b/version/version.go
@@ -1,3 +1,3 @@
 package version
 
-const Version = "1.1.2"
+const Version = "1.1.3"