aboutsummaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorKN4CK3R <admin@oldschoolhack.me>2023-08-08 02:46:10 +0200
committerGitHub <noreply@github.com>2023-08-08 00:46:10 +0000
commit0c6ae61229bce9d9ad3d359cee927464968a2dd1 (patch)
treee7322e6b8ad0a34868e8d9cae445ffc24a3ca191 /services
parentc2b6897e35ccdebc4b49cfc7fb165ee654c8e55d (diff)
downloadgitea-0c6ae61229bce9d9ad3d359cee927464968a2dd1.tar.gz
gitea-0c6ae61229bce9d9ad3d359cee927464968a2dd1.zip
Allow package cleanup from admin page (#25307)
Until now expired package data gets deleted daily by a cronjob. The admin page shows the size of all packages and the size of unreferenced data. The users (#25035, #20631) expect the deletion of this data if they run the cronjob from the admin page but the job only deletes data older than 24h. This PR adds a new button which deletes all expired data. ![grafik](https://github.com/go-gitea/gitea/assets/1666336/b3e35d73-9496-4fa7-a20c-e5d30b1f6850) --------- Co-authored-by: silverwind <me@silverwind.io>
Diffstat (limited to 'services')
-rw-r--r--services/cron/tasks_basic.go2
-rw-r--r--services/packages/cleanup/cleanup.go26
2 files changed, 23 insertions, 5 deletions
diff --git a/services/cron/tasks_basic.go b/services/cron/tasks_basic.go
index 2e6560ec0c..2a213ae515 100644
--- a/services/cron/tasks_basic.go
+++ b/services/cron/tasks_basic.go
@@ -152,7 +152,7 @@ func registerCleanupPackages() {
OlderThan: 24 * time.Hour,
}, func(ctx context.Context, _ *user_model.User, config Config) error {
realConfig := config.(*OlderThanConfig)
- return packages_cleanup_service.Cleanup(ctx, realConfig.OlderThan)
+ return packages_cleanup_service.CleanupTask(ctx, realConfig.OlderThan)
})
}
diff --git a/services/packages/cleanup/cleanup.go b/services/packages/cleanup/cleanup.go
index 43fbc1ad9b..77bcfb1942 100644
--- a/services/packages/cleanup/cleanup.go
+++ b/services/packages/cleanup/cleanup.go
@@ -20,9 +20,17 @@ import (
debian_service "code.gitea.io/gitea/services/packages/debian"
)
-// Cleanup removes expired package data
-func Cleanup(taskCtx context.Context, olderThan time.Duration) error {
- ctx, committer, err := db.TxContext(taskCtx)
+// Task method to execute cleanup rules and cleanup expired package data
+func CleanupTask(ctx context.Context, olderThan time.Duration) error {
+ if err := ExecuteCleanupRules(ctx); err != nil {
+ return err
+ }
+
+ return CleanupExpiredData(ctx, olderThan)
+}
+
+func ExecuteCleanupRules(outerCtx context.Context) error {
+ ctx, committer, err := db.TxContext(outerCtx)
if err != nil {
return err
}
@@ -30,7 +38,7 @@ func Cleanup(taskCtx context.Context, olderThan time.Duration) error {
err = packages_model.IterateEnabledCleanupRules(ctx, func(ctx context.Context, pcr *packages_model.PackageCleanupRule) error {
select {
- case <-taskCtx.Done():
+ case <-outerCtx.Done():
return db.ErrCancelledf("While processing package cleanup rules")
default:
}
@@ -122,6 +130,16 @@ func Cleanup(taskCtx context.Context, olderThan time.Duration) error {
return err
}
+ return committer.Commit()
+}
+
+func CleanupExpiredData(outerCtx context.Context, olderThan time.Duration) error {
+ ctx, committer, err := db.TxContext(outerCtx)
+ if err != nil {
+ return err
+ }
+ defer committer.Close()
+
if err := container_service.Cleanup(ctx, olderThan); err != nil {
return err
}