Download as
Browse Code »

Commit e66585be0b3b00da830065af12daf8cf758649a7

Authored by Antonio Terceiro
1 parent 5dd92056
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

ActionItem990: using expire_timeout_cache, removing unused code

Showing 2 changed files with 1 additions and 9 deletions   Show diff stats
app/sweepers/friendship_sweeper.rb
  Diff comments   View file @e66585b
@@ -26,10 +26,6 @@ protected @@ -26,10 +26,6 @@ protected
26 blocks.map(&:cache_keys).each{|ck|expire_timeout_fragment(ck)} 26 blocks.map(&:cache_keys).each{|ck|expire_timeout_fragment(ck)}
27 end 27 end
28 28
29 - def expire_fragment(*args)  
30 - ActionController::Base.new().expire_fragment(*args)  
31 - end  
32 -  
33 def expire_timeout_fragment(*args) 29 def expire_timeout_fragment(*args)
34 ActionController::Base.new().expire_timeout_fragment(*args) 30 ActionController::Base.new().expire_timeout_fragment(*args)
35 end 31 end
app/sweepers/role_assignment_sweeper.rb
  Diff comments   View file @e66585b
@@ -19,7 +19,7 @@ protected @@ -19,7 +19,7 @@ protected
19 def expire_cache(profile) 19 def expire_cache(profile)
20 profile.cache_keys.each { |ck| 20 profile.cache_keys.each { |ck|
21 cache_key = ck.gsub(/(.)-\d.*$/, '\1') 21 cache_key = ck.gsub(/(.)-\d.*$/, '\1')
22 - expire_fragment(/#{cache_key}/) 22 + expire_timeout_fragment(/#{cache_key}/)
23 } 23 }
24 24
25 profile.blocks_to_expire_cache.each { |block| 25 profile.blocks_to_expire_cache.each { |block|
@@ -28,10 +28,6 @@ protected @@ -28,10 +28,6 @@ protected
28 } 28 }
29 end 29 end
30 30
31 - def expire_fragment(*args)  
32 - ActionController::Base.new().expire_fragment(*args)  
33 - end  
34 -  
35 def expire_timeout_fragment(*args) 31 def expire_timeout_fragment(*args)
36 ActionController::Base.new().expire_timeout_fragment(*args) 32 ActionController::Base.new().expire_timeout_fragment(*args)
37 end 33 end