Skip to content

Commit

Permalink
[feature] Lower remote media cache config duration (#2007)
Browse files Browse the repository at this point in the history
The old default of 30d can lead to a lot of media getting cached and
significant disk usage, even on small or single person instances. A lot
of deployments decrease this value, to 15 or even less. This is less of
an issue when using object storage, but for local storage which is the
more popular deployment option running out of disk space is unpleasant.

With GoToSocial's aim to fit in small places, this changes the default
to a much more conservative 7 days. In all likelihood people aren't
scrolling that far back in their timeline so this change shouldn't
result in any issue. Existing deployments will only be affected by
this change if the admin hasn't already configured this value, or didn't
bootstrap from the example configuration.
  • Loading branch information
daenney committed Jul 21, 2023
1 parent fa57c69 commit da82820
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions docs/configuration/media.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ media-description-max-chars: 500
#
# If this is set to 0, then media from remote instances will be cached indefinitely.
# Examples: [30, 60, 7, 0]
# Default: 30
media-remote-cache-days: 30
# Default: 7
media-remote-cache-days: 7

# Int. Max size in bytes of emojis uploaded to this instance via the admin API.
# The default is the same as the Mastodon size limit for emojis (50kb), which allows
Expand Down
4 changes: 2 additions & 2 deletions example/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -478,8 +478,8 @@ media-description-max-chars: 500
#
# If this is set to 0, then media from remote instances will be cached indefinitely.
# Examples: [30, 60, 7, 0]
# Default: 30
media-remote-cache-days: 30
# Default: 7
media-remote-cache-days: 7

# Int. Max size in bytes of emojis uploaded to this instance via the admin API.
# The default is the same as the Mastodon size limit for emojis (50kb), which allows
Expand Down
2 changes: 1 addition & 1 deletion internal/config/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var Defaults = Configuration{
MediaVideoMaxSize: 40 * bytesize.MiB,
MediaDescriptionMinChars: 0,
MediaDescriptionMaxChars: 500,
MediaRemoteCacheDays: 30,
MediaRemoteCacheDays: 7,
MediaEmojiLocalMaxSize: 50 * bytesize.KiB,
MediaEmojiRemoteMaxSize: 100 * bytesize.KiB,

Expand Down
2 changes: 1 addition & 1 deletion testrig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ var testDefaults = config.Configuration{
MediaVideoMaxSize: 41943040, // 40mb
MediaDescriptionMinChars: 0,
MediaDescriptionMaxChars: 500,
MediaRemoteCacheDays: 30,
MediaRemoteCacheDays: 7,
MediaEmojiLocalMaxSize: 51200, // 50kb
MediaEmojiRemoteMaxSize: 102400, // 100kb

Expand Down

0 comments on commit da82820

Please sign in to comment.