diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-02-13 20:53:39 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-13 20:53:39 -0300 |
| commit | f06ee2a703e8cd7c18f70642f3d1d15a43eeb7ce (patch) | |
| tree | 36d1b1816c4b4b15679d5c3f32a1f9ad805bcd6c /actionpack/lib | |
| parent | 2809f38ab8d75dabb5b053ac14f5e78a2ad802fa (diff) | |
| parent | dde7134e07cb84f2efcf9704de144ef9ed38d360 (diff) | |
| download | rails-f06ee2a703e8cd7c18f70642f3d1d15a43eeb7ce.tar.gz rails-f06ee2a703e8cd7c18f70642f3d1d15a43eeb7ce.tar.bz2 rails-f06ee2a703e8cd7c18f70642f3d1d15a43eeb7ce.zip | |
Merge pull request #27926 from st0012/freeze-cache-instrument-name
Freeze fragment cache related instrument name.
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/caching/fragments.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/caching.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/caching/fragments.rb b/actionpack/lib/abstract_controller/caching/fragments.rb index c85b4adba1..13fa2b393d 100644 --- a/actionpack/lib/abstract_controller/caching/fragments.rb +++ b/actionpack/lib/abstract_controller/caching/fragments.rb @@ -136,7 +136,7 @@ module AbstractController def instrument_fragment_cache(name, key) # :nodoc: payload = instrument_payload(key) - ActiveSupport::Notifications.instrument("#{name}.#{instrument_name}", payload) { yield } + ActiveSupport::Notifications.instrument("#{name}.#{instrument_name}".freeze, payload) { yield } end end end diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index a9a8508abc..954265ad97 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -38,7 +38,7 @@ module ActionController end def instrument_name - "action_controller" + "action_controller".freeze end end end |