Download as
Browse Code »

Commit 3cafda053c04c324071f21b5386c9b6919843482

Authored by Antonio Terceiro
2 parents f7c05bdf dbc6d527
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

Merge branch 'fix-initializer-passenger-crash' into 'master' 

Fix passenger initializer crash when using memcache store

See merge request !428
Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
config/initializers/passenger.rb
  Diff comments   View file @3cafda0
@@ -3,7 +3,7 @@ if defined? PhusionPassenger @@ -3,7 +3,7 @@ if defined? PhusionPassenger
3 # from http://russbrooks.com/2010/10/20/rails-cache-memcache-on-passenger-with-smart-spawning 3 # from http://russbrooks.com/2010/10/20/rails-cache-memcache-on-passenger-with-smart-spawning
4 PhusionPassenger.on_event :starting_worker_process do |forked| 4 PhusionPassenger.on_event :starting_worker_process do |forked|
5 if forked 5 if forked
6 - Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class == ActiveSupport::Cache::MemCacheStore 6 + Rails.cache.instance_variable_get(:@data).reset if Rails.cache.class.name == 'ActiveSupport::Cache::MemCacheStore'
7 end 7 end
8 end 8 end
9 end 9 end