mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-02-27 20:47:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

groupware: minor logging improvements to the session cache

Browse Source
This commit is contained in:
Pascal Bleser
2026-02-23 09:33:32 +01:00
parent e629fadc3f
commit 7f697ef27d
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/groupware/pkg/groupware/framework.go
View File

@@ -50,6 +50,10 @@ const (
logStreamId = "stream-id"
logPath = "path"
logMethod = "method"
logPreviousState = "old-state"
logNewState = "new-state"
logCacheEvictionReason = "reason"
logCacheType = "type"
)
// Minimalistic representation of a user, containing only the attributes that are

26
services/groupware/pkg/groupware/session.go
View File

@@ -116,23 +116,23 @@ type ttlcacheSessionCache struct {
var _ sessionCache = &ttlcacheSessionCache{}
var _ jmap.SessionEventListener = &ttlcacheSessionCache{}
func (l *ttlcacheSessionCache) load(c *ttlcache.Cache[sessionCacheKey, cachedSession], key sessionCacheKey, ctx context.Context) cachedSession {
func (l *ttlcacheSessionCache) load(key sessionCacheKey, ctx context.Context) cachedSession {
username := key.username()
sessionUrl, gwerr := l.sessionUrlProvider(ctx, username)
if gwerr != nil {
l.logger.Warn().Str("username", username).Str("code", gwerr.Code).Msgf("failed to determine session URL for '%v'", key)
l.logger.Warn().Str(logUsername, username).Str(logErrorCode, gwerr.Code).Msgf("failed to determine session URL for '%v'", key)
now := time.Now()
until := now.Add(l.errorTtl)
return failedSession{since: now, until: until, err: gwerr}
}
session, jerr := l.sessionSupplier(ctx, sessionUrl, username, l.logger)
if jerr != nil {
l.logger.Warn().Str("username", username).Err(jerr).Msgf("failed to create session for '%v'", key)
l.logger.Warn().Str(logUsername, username).Err(jerr).Msgf("failed to create session for '%v'", key)
now := time.Now()
until := now.Add(l.errorTtl)
return failedSession{since: now, until: until, err: groupwareErrorFromJmap(jerr)}
} else {
l.logger.Debug().Str("username", username).Msgf("successfully created session for '%v'", key)
l.logger.Debug().Str(logUsername, username).Msgf("successfully created session for '%v'", key)
now := time.Now()
until := now.Add(l.successTtl)
return succeededSession{since: now, until: until, session: session}
@@ -142,7 +142,7 @@ func (l *ttlcacheSessionCache) load(c *ttlcache.Cache[sessionCacheKey, cachedSes
func (c *ttlcacheSessionCache) Get(ctx context.Context, username string) cachedSession {
key := toSessionCacheKey(username)
item, cached := c.sessionCache.GetOrSetFunc(key, func() cachedSession {
return c.load(c.sessionCache, key, ctx) // TODO can't set the TTL on the cached item
return c.load(key, ctx) // TODO can't set the TTL on the cached item
})
if item != nil {
value := item.Value()
@@ -266,7 +266,13 @@ func (b sessionCacheBuilder) build() (sessionCache, error) {
if !item.Value().Success() {
tipe = "failed"
}
b.logger.Trace().Msgf("%s session cache eviction of user '%v' after %v: %v", tipe, item.Key(), spentInCache, reason)
if b.logger.Trace().Enabled() {
b.logger.Trace().
Str(logUsername, item.Key().username()).
Str(logCacheEvictionReason, reason).
Str(logCacheType, tipe).
Msgf("%s session cache eviction of user '%v' after %v: %v", tipe, item.Key(), spentInCache, reason)
}
}
})
@@ -293,7 +299,13 @@ func (c ttlcacheSessionCache) OnSessionOutdated(session *jmap.Session, newSessio
c.outdatedSessionCounter.Inc()
}
c.logger.Trace().Msgf("removed outdated session for user '%v': state %v -> %v", session.Username, session.State, newSessionState)
if c.logger.Trace().Enabled() {
c.logger.Trace().
Str(logUsername, log.SafeString(session.Username)).
Str(logPreviousState, string(session.State)).
Str(logNewState, string(newSessionState)).
Msgf("removed outdated session for user '%v': state %v -> %v", session.Username, session.State, newSessionState)
}
}
// A Prometheus Collector for the Session cache metrics.