diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml index 191aed0747e0b3c39cb1bf775a6683bf72401523..340bf2e96726d01bc8317cf1a112e79e37a999ad 100644 --- a/app/views/events/_event.html.haml +++ b/app/views/events/_event.html.haml @@ -2,14 +2,14 @@ %div.event-item %span.cgray.right #{time_ago_in_words(event.created_at)} ago. + - cache event do + = image_tag gravatar_icon(event.author_email), class: "avatar s24" - = image_tag gravatar_icon(event.author_email), class: "avatar s24" - - - if event.push? - = render "events/event/push", event: event - .clearfix - - elsif event.note? - = render "events/event/note", event: event - - else - = render "events/event/common", event: event + - if event.push? + = render "events/event/push", event: event + .clearfix + - elsif event.note? + = render "events/event/note", event: event + - else + = render "events/event/common", event: event diff --git a/config/initializers/passenger_fix.rb b/config/initializers/passenger_fix.rb index 3a88eb10a366bbba0bbee7f73d4ea3285ce29b71..d5fa5e0299caddbac0d73e16099c3caacbb3e1bd 100644 --- a/config/initializers/passenger_fix.rb +++ b/config/initializers/passenger_fix.rb @@ -10,7 +10,16 @@ if defined?(PhusionPassenger) # https://github.com/redis/redis-rb/wiki/redis-rb-on-Phusion-Passenger # PhusionPassenger.on_event(:starting_worker_process) do |forked| - # if we're in smart spawning mode, reconnect to Redis - Resque.redis.client.reconnect if forked + # do nothing if we're not in smart spawning mode + return unless forked + + # reconnect to Redis + Resque.redis.client.reconnect + + # reconnect to cache store unless :memory_store or :null_store is used + unless [ActiveSupport::Cache::MemoryStore, + ActiveSupport::Cache::NullStore].include? Rails.cache.class + Rails.cache.instance_variable_get(:@data).reset + end end end