Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
**Master**

- Update file cache size accounting when replacing an entry. [Oskar Eichler](https://github.com/OskarEichler)

Get upgrade notes from Sprockets 3.x to 4.x at https://github.com/rails/sprockets/blob/master/UPGRADING.md

# 4.4.1
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ If you want to work on Sprockets or better understand how it works read [How Spr

## Behavior Overview

Replacing an existing file cache entry adjusts size accounting by the change in stored bytes, so growth can trigger eviction and shrinkage releases capacity.

You can interact with Sprockets primarily through directives and file extensions. This section covers how to use each of these things, and the defaults that ship with Sprockets.

Since you are likely using Sprockets through another framework (such as the [Rails asset pipeline](http://guides.rubyonrails.org/asset_pipeline.html)), there will be configuration options you can toggle that will change behavior such as what directories or files get compiled. For that documentation you should see your framework's documentation.
Expand Down
8 changes: 4 additions & 4 deletions lib/sprockets/cache/file_store.rb
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ def set(key, value)
# Ensure directory exists
FileUtils.mkdir_p File.dirname(path)

# Check if cache exists before writing
exists = File.exist?(path)
# Record the previous size before replacing the cache file
previous_size = safe_stat(path)&.size || 0

# Serialize value
marshaled = Marshal.dump(value)
Expand All @@ -111,8 +111,8 @@ def set(key, value)
# Write data
PathUtils.atomic_write(path) do |f|
f.write(raw)
if defined?(@size) && !exists
@size += f.size
if defined?(@size)
@size += f.size - previous_size
end
end

Expand Down
Loading