mvaldes14/vikunja-api
1
0
Fork 0
forked from vikunja/vikunja
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed metrics on/off setting

Browse Source
This commit is contained in:
kolaente 2019-09-01 18:39:03 +02:00
parent 43676f045c
commit 1d98e4cabe
Signed by untrusted user: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/user.go
View File

@ -211,7 +211,7 @@ func GetUserFromClaims(claims jwt.MapClaims) (user *User, err error) {
func UpdateActiveUsersFromContext(c echo.Context) (err error) { func UpdateActiveUsersFromContext(c echo.Context) (err error) {
user, err := GetCurrentUser(c) user, err := GetCurrentUser(c)
if err != nil { if err != nil {
return err return
} }
allActiveUsers, err := metrics.GetActiveUsers() allActiveUsers, err := metrics.GetActiveUsers()

125
pkg/routes/metrics.go
View File

@ -27,72 +27,75 @@ import (
) )
func setupMetrics(a *echo.Group) { func setupMetrics(a *echo.Group) {
if config.ServiceEnableMetrics.GetBool() { if !config.ServiceEnableMetrics.GetBool() {
return
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.Task{},
},
{
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()))
} }
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.Task{},
},
{
metrics.TeamCountKey,
models.Team{},
},
} {
// Set initial totals
total, err := models.GetTotalCount(c.Type)
if err != nil {
log.Fatalf("Could not get 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) { func setupMetricsMiddleware(a *echo.Group) {
if config.ServiceJWTSecret.GetBool() { if !config.ServiceEnableMetrics.GetBool() {
a.Use(func(next echo.HandlerFunc) echo.HandlerFunc { return
return func(c echo.Context) error { }
// Update currently active users a.Use(func(next echo.HandlerFunc) echo.HandlerFunc {
if err := models.UpdateActiveUsersFromContext(c); err != nil { return func(c echo.Context) error {
log.Error(err)
return next(c) // Update currently active users
} if err := models.UpdateActiveUsersFromContext(c); err != nil {
log.Error(err)
return next(c) return next(c)
} }
}) return next(c)
} }
})
} }