mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-29 10:57:44 +09:00 
			
		
		
		
	Move registerActionsCleanup to initActionsTasks (#31721)
				
					
				
			There's already `initActionsTasks`; it will avoid additional check for if Actions enabled to move `registerActionsCleanup` into it. And we don't really need `OlderThanConfig`.
This commit is contained in:
		| @@ -5,7 +5,6 @@ package actions | ||||
|  | ||||
| import ( | ||||
| 	"context" | ||||
| 	"time" | ||||
|  | ||||
| 	"code.gitea.io/gitea/models/actions" | ||||
| 	"code.gitea.io/gitea/modules/log" | ||||
| @@ -13,7 +12,7 @@ import ( | ||||
| ) | ||||
|  | ||||
| // Cleanup removes expired actions logs, data and artifacts | ||||
| func Cleanup(taskCtx context.Context, olderThan time.Duration) error { | ||||
| func Cleanup(taskCtx context.Context) error { | ||||
| 	// TODO: clean up expired actions logs | ||||
|  | ||||
| 	// clean up expired artifacts | ||||
|   | ||||
| @@ -19,6 +19,7 @@ func initActionsTasks() { | ||||
| 	registerStopEndlessTasks() | ||||
| 	registerCancelAbandonedJobs() | ||||
| 	registerScheduleTasks() | ||||
| 	registerActionsCleanup() | ||||
| } | ||||
|  | ||||
| func registerStopZombieTasks() { | ||||
| @@ -63,3 +64,13 @@ func registerScheduleTasks() { | ||||
| 		return actions_service.StartScheduleTasks(ctx) | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| func registerActionsCleanup() { | ||||
| 	RegisterTaskFatal("cleanup_actions", &BaseConfig{ | ||||
| 		Enabled:    true, | ||||
| 		RunAtStart: true, | ||||
| 		Schedule:   "@midnight", | ||||
| 	}, func(ctx context.Context, _ *user_model.User, _ Config) error { | ||||
| 		return actions_service.Cleanup(ctx) | ||||
| 	}) | ||||
| } | ||||
|   | ||||
| @@ -13,7 +13,6 @@ import ( | ||||
| 	"code.gitea.io/gitea/models/webhook" | ||||
| 	"code.gitea.io/gitea/modules/git" | ||||
| 	"code.gitea.io/gitea/modules/setting" | ||||
| 	"code.gitea.io/gitea/services/actions" | ||||
| 	"code.gitea.io/gitea/services/auth" | ||||
| 	"code.gitea.io/gitea/services/migrations" | ||||
| 	mirror_service "code.gitea.io/gitea/services/mirror" | ||||
| @@ -157,20 +156,6 @@ func registerCleanupPackages() { | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| func registerActionsCleanup() { | ||||
| 	RegisterTaskFatal("cleanup_actions", &OlderThanConfig{ | ||||
| 		BaseConfig: BaseConfig{ | ||||
| 			Enabled:    true, | ||||
| 			RunAtStart: true, | ||||
| 			Schedule:   "@midnight", | ||||
| 		}, | ||||
| 		OlderThan: 24 * time.Hour, | ||||
| 	}, func(ctx context.Context, _ *user_model.User, config Config) error { | ||||
| 		realConfig := config.(*OlderThanConfig) | ||||
| 		return actions.Cleanup(ctx, realConfig.OlderThan) | ||||
| 	}) | ||||
| } | ||||
|  | ||||
| func initBasicTasks() { | ||||
| 	if setting.Mirror.Enabled { | ||||
| 		registerUpdateMirrorTask() | ||||
| @@ -187,7 +172,4 @@ func initBasicTasks() { | ||||
| 	if setting.Packages.Enabled { | ||||
| 		registerCleanupPackages() | ||||
| 	} | ||||
| 	if setting.Actions.Enabled { | ||||
| 		registerActionsCleanup() | ||||
| 	} | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user