diff --git a/pkg/services/annotations/annotationsimpl/xorm_store.go b/pkg/services/annotations/annotationsimpl/xorm_store.go index 2525601fed0..a9edcebbee2 100644 --- a/pkg/services/annotations/annotationsimpl/xorm_store.go +++ b/pkg/services/annotations/annotationsimpl/xorm_store.go @@ -531,11 +531,8 @@ func (r *xormRepositoryImpl) CleanAnnotations(ctx context.Context, cfg setting.A if err != nil { return 0, err } - r.log.Error("Annotations to clean by time", "count", len(ids), "ids", ids, "cond", cond, "err", err) - x, y := r.deleteByIDs(ctx, "annotation", ids) - r.log.Error("cleaned annotations by time", "count", len(ids), "affected", x, "err", y) - return x, y + return r.deleteByIDs(ctx, "annotation", ids) }) totalAffected += affected if err != nil { @@ -551,11 +548,8 @@ func (r *xormRepositoryImpl) CleanAnnotations(ctx context.Context, cfg setting.A if err != nil { return 0, err } - r.log.Error("Annotations to clean by count", "count", len(ids), "ids", ids, "cond", cond, "err", err) - x, y := r.deleteByIDs(ctx, "annotation", ids) - r.log.Error("cleaned annotations by count", "count", len(ids), "affected", x, "err", y) - return x, y + return r.deleteByIDs(ctx, "annotation", ids) }) totalAffected += affected if err != nil { @@ -573,11 +567,8 @@ func (r *xormRepositoryImpl) CleanOrphanedAnnotationTags(ctx context.Context) (i if err != nil { return 0, err } - r.log.Error("Tags to clean", "count", len(ids), "ids", ids, "cond", cond, "err", err) - x, y := r.deleteByIDs(ctx, "annotation_tag", ids) - r.log.Error("cleaned tags", "count", len(ids), "affected", x, "err", y) - return x, y + return r.deleteByIDs(ctx, "annotation_tag", ids) }) } diff --git a/pkg/services/cleanup/cleanup.go b/pkg/services/cleanup/cleanup.go index d3e36eda27c..a96d5f5a702 100644 --- a/pkg/services/cleanup/cleanup.go +++ b/pkg/services/cleanup/cleanup.go @@ -74,7 +74,7 @@ func (j cleanUpJob) String() string { func (srv *CleanUpService) Run(ctx context.Context) error { srv.cleanUpTmpFiles(ctx) - ticker := time.NewTicker(time.Minute * 1) + ticker := time.NewTicker(time.Minute * 10) for { select { case <-ticker.C: