Download as
Browse Code »

Commit 3cafda053c04c324071f21b5386c9b6919843482

Authored by Antonio Terceiro
2 parents f7c05bdf dbc6d527
Exists in master and in 27 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, temp_ratings, tests, tests_fixies

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