Download as
Browse Code »

Commit 91226c8bc828c21cc28fb65b21f6c218ddf869bc

Authored by Moises Machado
Committed by Antonio Terceiro
1 parent ef9e7758
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem1163: fragment.to_time for timeouts and is expired if theres only the timout fragment

Showing 1 changed file with 3 additions and 1 deletions   Show diff stats
vendor/plugins/timed_cached_fragment/lib/timed_cache_fragment.rb
  Diff comments   View file @91226c8
@@ -20,6 +20,7 @@ module ActionController @@ -20,6 +20,7 @@ module ActionController
20 #checks to see if a cache has fully expired 20 #checks to see if a cache has fully expired
21 def is_cache_expired?(name, is_key = false) 21 def is_cache_expired?(name, is_key = false)
22 key = is_key ? name : fragment_cache_key(name) 22 key = is_key ? name : fragment_cache_key(name)
  23 + return true unless read_fragment(key)
23 timeout = get_timeout(key) 24 timeout = get_timeout(key)
24 return (!timeout) || (timeout < Time.now) 25 return (!timeout) || (timeout < Time.now)
25 end 26 end
@@ -43,7 +44,8 @@ module ActionController @@ -43,7 +44,8 @@ module ActionController
43 expire_fragment('timeout:' + key) 44 expire_fragment('timeout:' + key)
44 end 45 end
45 def get_timeout(key) 46 def get_timeout(key)
46 - read_fragment('timeout:' + key) 47 + frag = read_fragment('timeout:' + key)
  48 + frag ? frag.to_time : nil
47 end 49 end
48 def set_timeout(key, value) 50 def set_timeout(key, value)
49 write_fragment('timeout:' + key, value) 51 write_fragment('timeout:' + key, value)