Skip to content

Commit

Permalink
Merge pull request #1918 from flant/log-device-flow-gc
Browse files Browse the repository at this point in the history
fix: log device flow entities GC result if no auth entities collected
  • Loading branch information
sagikazarmark committed Jan 14, 2021
2 parents ccbf6c6 + 30c3d78 commit afba757
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
4 changes: 2 additions & 2 deletions server/server.go
Expand Up @@ -468,8 +468,8 @@ func (s *Server) startGarbageCollection(ctx context.Context, frequency time.Dura
case <-time.After(frequency):
if r, err := s.storage.GarbageCollect(now()); err != nil {
s.logger.Errorf("garbage collection failed: %v", err)
} else if r.AuthRequests > 0 || r.AuthCodes > 0 {
s.logger.Infof("garbage collection run, delete auth requests=%d, auth codes=%d, device requests =%d, device tokens=%d",
} else if !r.IsEmpty() {
s.logger.Infof("garbage collection run, delete auth requests=%d, auth codes=%d, device requests=%d, device tokens=%d",
r.AuthRequests, r.AuthCodes, r.DeviceRequests, r.DeviceTokens)
}
}
Expand Down
8 changes: 8 additions & 0 deletions storage/storage.go
Expand Up @@ -55,6 +55,14 @@ type GCResult struct {
DeviceTokens int64
}

// IsEmpty returns whether the garbage collection result is empty or not.
func (g *GCResult) IsEmpty() bool {
return g.AuthRequests == 0 &&
g.AuthCodes == 0 &&
g.DeviceRequests == 0 &&
g.DeviceTokens == 0
}

// Storage is the storage interface used by the server. Implementations are
// required to be able to perform atomic compare-and-swap updates and either
// support timezones or standardize on UTC.
Expand Down

0 comments on commit afba757

Please sign in to comment.