Moved metrics init to seperate methods

pkg/routes/metrics.go

@@ -0,0 +1,98 @@
+// Copyright 2019 Vikunja and contriubtors. All rights reserved.
+//
+// This file is part of Vikunja.
+//
+// Vikunja is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Vikunja is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Vikunja.  If not, see <https://www.gnu.org/licenses/>.
+
+package routes
+
+import (
+	"code.vikunja.io/api/pkg/config"
+	"code.vikunja.io/api/pkg/log"
+	"code.vikunja.io/api/pkg/metrics"
+	"code.vikunja.io/api/pkg/models"
+	"github.com/labstack/echo/v4"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+)
+
+func setupMetrics(a *echo.Group) {
+	if config.ServiceEnableMetrics.GetBool() {
+
+		if !config.RedisEnabled.GetBool() {
+			log.Fatal("You have to enable redis in order to use metrics")
+		}
+
+		metrics.InitMetrics()
+
+		type countable struct {
+			Rediskey string
+			Type     interface{}
+		}
+
+		for _, c := range []countable{
+			{
+				metrics.ListCountKey,
+				models.List{},
+			},
+			{
+				metrics.UserCountKey,
+				models.User{},
+			},
+			{
+				metrics.NamespaceCountKey,
+				models.Namespace{},
+			},
+			{
+				metrics.TaskCountKey,
+				models.ListTask{},
+			},
+			{
+				metrics.TeamCountKey,
+				models.Team{},
+			},
+		} {
+			// Set initial totals
+			total, err := models.GetTotalCount(c.Type)
+			if err != nil {
+				log.Fatalf("Could not set initial count for %v, error was %s", c.Type, err)
+			}
+			if err := metrics.SetCount(total, c.Rediskey); err != nil {
+				log.Fatalf("Could not set initial count for %v, error was %s", c.Type, err)
+			}
+		}
+
+		// init active users, sometimes we'll have garbage from previous runs in redis instead
+		if err := metrics.SetActiveUsers([]*metrics.ActiveUser{}); err != nil {
+			log.Fatalf("Could not set initial count for active users, error was %s", err)
+		}
+
+		a.GET("/metrics", echo.WrapHandler(promhttp.Handler()))
+	}
+}
+
+func setupMetricsMiddleware(a *echo.Group) {
+	if config.ServiceJWTSecret.GetBool() {
+		a.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
+			return func(c echo.Context) error {
+
+				// Update currently active users
+				if err := models.UpdateActiveUsersFromContext(c); err != nil {
+					log.Error(err)
+					return next(c)
+				}
+				return next(c)
+			}
+		})
+	}
+}

pkg/routes/routes.go

@@ -41,7 +41,6 @@ package routes
 import (
 	"code.vikunja.io/api/pkg/config"
 	"code.vikunja.io/api/pkg/log"
-	"code.vikunja.io/api/pkg/metrics"
 	"code.vikunja.io/api/pkg/models"
 	apiv1 "code.vikunja.io/api/pkg/routes/api/v1"
 	"code.vikunja.io/api/pkg/routes/caldav"
@@ -52,7 +51,6 @@ import (
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	elog "github.com/labstack/gommon/log"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"strings"
 )
 
@@ -155,58 +153,7 @@ func registerAPIRoutes(a *echo.Group) {
 	a.GET("/docs", apiv1.RedocUI)
 
 	// Prometheus endpoint
-	if config.ServiceEnableMetrics.GetBool() {
+	setupMetrics(a)
-
-		if !config.RedisEnabled.GetBool() {
-			log.Fatal("You have to enable redis in order to use metrics")
-		}
-
-		metrics.InitMetrics()
-
-		type countable struct {
-			Rediskey string
-			Type     interface{}
-		}
-
-		for _, c := range []countable{
-			{
-				metrics.ListCountKey,
-				models.List{},
-			},
-			{
-				metrics.UserCountKey,
-				models.User{},
-			},
-			{
-				metrics.NamespaceCountKey,
-				models.Namespace{},
-			},
-			{
-				metrics.TaskCountKey,
-				models.ListTask{},
-			},
-			{
-				metrics.TeamCountKey,
-				models.Team{},
-			},
-		} {
-			// Set initial totals
-			total, err := models.GetTotalCount(c.Type)
-			if err != nil {
-				log.Fatalf("Could not set initial count for %v, error was %s", c.Type, err)
-			}
-			if err := metrics.SetCount(total, c.Rediskey); err != nil {
-				log.Fatalf("Could not set initial count for %v, error was %s", c.Type, err)
-			}
-		}
-
-		// init active users, sometimes we'll have garbage from previous runs in redis instead
-		if err := metrics.SetActiveUsers([]*metrics.ActiveUser{}); err != nil {
-			log.Fatalf("Could not set initial count for active users, error was %s", err)
-		}
-
-		a.GET("/metrics", echo.WrapHandler(promhttp.Handler()))
-	}
 
 	// User stuff
 	a.POST("/login", apiv1.Login)
@@ -226,19 +173,7 @@ func registerAPIRoutes(a *echo.Group) {
 	setupRateLimit(a)
 
 	// Middleware to collect metrics
-	if config.ServiceJWTSecret.GetBool() {
+	setupMetricsMiddleware(a)
-		a.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
-			return func(c echo.Context) error {
-
-				// Update currently active users
-				if err := models.UpdateActiveUsersFromContext(c); err != nil {
-					log.Error(err)
-					return next(c)
-				}
-				return next(c)
-			}
-		})
-	}
 
 	a.POST("/tokenTest", apiv1.CheckToken)