diff options
| -rw-r--r-- | conf/app.ini | 7 | ||||
| -rw-r--r-- | models/repo.go | 61 | ||||
| -rw-r--r-- | modules/cron/cron.go | 11 | ||||
| -rw-r--r-- | modules/setting/setting.go | 16 |
4 files changed, 92 insertions, 3 deletions
diff --git a/conf/app.ini b/conf/app.ini index 254b1bc549..8338a1b93d 100644 --- a/conf/app.ini +++ b/conf/app.ini @@ -391,6 +391,13 @@ ARGS = RUN_AT_START = true SCHEDULE = @every 24h +; Clean up old repository archives +[cron.archive_cleanup] +RUN_AT_START = true +SCHEDULE = @every 24h +; Archives created more than OLDER_THAN ago are subject to deletion +OLDER_THAN = 24h + [git] ; Disables highlight of added and removed changes DISABLE_DIFF_HIGHLIGHT = false diff --git a/models/repo.go b/models/repo.go index 9b1b868778..a7a36cc7d0 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1837,6 +1837,60 @@ func DeleteRepositoryArchives() error { }) } +// DeleteOldRepositoryArchives deletes old repository archives. +func DeleteOldRepositoryArchives() { + if taskStatusTable.IsRunning(archiveCleanup) { + return + } + taskStatusTable.Start(archiveCleanup) + defer taskStatusTable.Stop(archiveCleanup) + + log.Trace("Doing: ArchiveCleanup") + + if err := x.Where("id > 0").Iterate(new(Repository), deleteOldRepositoryArchives); err != nil { + log.Error(4, "ArchiveClean: %v", err) + } +} + +func deleteOldRepositoryArchives(idx int, bean interface{}) error { + repo := bean.(*Repository) + basePath := filepath.Join(repo.RepoPath(), "archives") + + for _, ty := range []string{"zip", "targz"} { + path := filepath.Join(basePath, ty) + file, err := os.Open(path) + if err != nil { + if !os.IsNotExist(err) { + log.Warn("Unable to open directory %s: %v", path, err) + return err + } + + // If the directory doesn't exist, that's okay. + continue + } + + files, err := file.Readdir(0) + file.Close() + if err != nil { + log.Warn("Unable to read directory %s: %v", path, err) + return err + } + + minimumOldestTime := time.Now().Add(-setting.Cron.ArchiveCleanup.OlderThan) + for _, info := range files { + if info.ModTime().Before(minimumOldestTime) && !info.IsDir() { + toDelete := filepath.Join(path, info.Name()) + // This is a best-effort purge, so we do not check error codes to confirm removal. + if err = os.Remove(toDelete); err != nil { + log.Trace("Unable to delete %s, but proceeding: %v", toDelete, err) + } + } + } + } + + return nil +} + func gatherMissingRepoRecords() ([]*Repository, error) { repos := make([]*Repository, 0, 10) if err := x. @@ -1915,9 +1969,10 @@ func RewriteRepositoryUpdateHook() error { var taskStatusTable = sync.NewStatusTable() const ( - mirrorUpdate = "mirror_update" - gitFsck = "git_fsck" - checkRepos = "check_repos" + mirrorUpdate = "mirror_update" + gitFsck = "git_fsck" + checkRepos = "check_repos" + archiveCleanup = "archive_cleanup" ) // GitFsck calls 'git fsck' to check repository health. diff --git a/modules/cron/cron.go b/modules/cron/cron.go index e1110d787b..785bf44ada 100644 --- a/modules/cron/cron.go +++ b/modules/cron/cron.go @@ -55,6 +55,17 @@ func NewContext() { go models.CheckRepoStats() } } + if setting.Cron.ArchiveCleanup.Enabled { + entry, err = c.AddFunc("Clean up old repository archives", setting.Cron.ArchiveCleanup.Schedule, models.DeleteOldRepositoryArchives) + if err != nil { + log.Fatal(4, "Cron[Clean up old repository archives]: %v", err) + } + if setting.Cron.ArchiveCleanup.RunAtStart { + entry.Prev = time.Now() + entry.ExecTimes++ + go models.DeleteOldRepositoryArchives() + } + } c.Start() } diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 1cbb3eac0a..747ddbf708 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -307,6 +307,12 @@ var ( RunAtStart bool Schedule string } `ini:"cron.check_repo_stats"` + ArchiveCleanup struct { + Enabled bool + RunAtStart bool + Schedule string + OlderThan time.Duration + } `ini:"cron.archive_cleanup"` }{ UpdateMirror: struct { Enabled bool @@ -334,6 +340,16 @@ var ( RunAtStart: true, Schedule: "@every 24h", }, + ArchiveCleanup: struct { + Enabled bool + RunAtStart bool + Schedule string + OlderThan time.Duration + }{ + RunAtStart: true, + Schedule: "@every 24h", + OlderThan: 24 * time.Hour, + }, } // Git settings |