[bugfix] set statuses-cleanup-remote-older-than to "0s", skip scheduling if 0 (#4869)
# Description > If this is a code change, please include a summary of what you've coded, and link to the issue(s) it closes/implements. > > If this is a documentation change, please briefly describe what you've changed and why. Fixes https://codeberg.org/superseriousbusiness/gotosocial/issues/4868 by changing default to 0s instead of 0. Also skips scheduling statuses cleanup if duration is not > 0 as there's no point. ## Checklist Please put an x inside each checkbox to indicate that you've read and followed it: `[ ]` -> `[x]` If this is a documentation change, only the first two checkboxes must be filled (you can delete the others if you want). - [x] I/we have read the [GoToSocial contribution guidelines](https://codeberg.org/superseriousbusiness/gotosocial/src/branch/main/CONTRIBUTING.md). - [x] I/we have not used so-called 'AI' to create the proposed changes. - [x] I/we have discussed the proposed changes already, either in an issue on the repository, or in the Matrix chat. - [x] I/we have performed a self-review of added code. - [x] I/we have written code that is legible and maintainable by others. - [x] I/we have commented the added code, particularly in hard-to-understand areas. - [x] I/we have made any necessary changes to documentation. - [ ] I/we have added tests that cover new code. - [x] I/we have run tests and they pass locally with the changes. - [x] I/we have run `go fmt ./...` and `golangci-lint run`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4869
This commit is contained in:
@@ -45,8 +45,8 @@ statuses-cleanup-cron: "0 1 * * 0"
|
||||
# Integer duration.
|
||||
#
|
||||
# Examples: ["6 months", "1 year", "2 years"]
|
||||
# Default: "0" (i.e. disabled)
|
||||
statuses-cleanup-remote-older-than: "0"
|
||||
# Default: "0s" (i.e. disabled)
|
||||
statuses-cleanup-remote-older-than: "0s"
|
||||
|
||||
# Int. Maximum number of statuses a user can schedule at time.
|
||||
# Examples: [300]
|
||||
|
||||
+2
-2
@@ -952,8 +952,8 @@ statuses-cleanup-cron: "0 1 * * 0"
|
||||
# Integer duration.
|
||||
#
|
||||
# Examples: ["6 months", "1 year", "2 years"]
|
||||
# Default: "0" (i.e. disabled)
|
||||
statuses-cleanup-remote-older-than: "0"
|
||||
# Default: "0s" (i.e. disabled)
|
||||
statuses-cleanup-remote-older-than: "0s"
|
||||
|
||||
# Int. Maximum number of statuses a user can schedule at time.
|
||||
# Examples: [300]
|
||||
|
||||
@@ -132,16 +132,20 @@ func (c *Cleaner) ScheduleJobs() error {
|
||||
panic("failed to schedule @mediacleanup")
|
||||
}
|
||||
|
||||
expr = config.GetStatusesCleanupCron()
|
||||
log.Infof(nil, "scheduling statuses cleanup: %s", expr.Expr)
|
||||
if _, dur := config.GetStatusesCleanupRemoteOlderThan().Duration(); dur > 0 {
|
||||
expr = config.GetStatusesCleanupCron()
|
||||
log.Infof(nil, "scheduling statuses cleanup: %s", expr.Expr)
|
||||
|
||||
// Schedule status cleaning by expr.
|
||||
if !c.state.Workers.Scheduler.Add(
|
||||
"@statuscleanup",
|
||||
c.cleanStatuses,
|
||||
expr,
|
||||
) {
|
||||
panic("failed to schedule @statuscleanup")
|
||||
// Schedule status cleaning by expr.
|
||||
if !c.state.Workers.Scheduler.Add(
|
||||
"@statuscleanup",
|
||||
c.cleanStatuses,
|
||||
expr,
|
||||
) {
|
||||
panic("failed to schedule @statuscleanup")
|
||||
}
|
||||
} else {
|
||||
log.Infof(nil, "skipping statuses cleanup scheduling, as statuses-cleanup-remote-older-than <= 0")
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
Reference in New Issue
Block a user