1 files changed, 34 insertions, 7 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 405327952..5f18be2e5 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -14,10 +14,32 @@ class ApplicationController < ActionController::Base
     layout "default"
     include FastGettext::Translation # make functions like _, n_, N_ etc available)
     before_filter :set_gettext_locale
-
+    before_filter :set_vary_header
     # scrub sensitive parameters from the logs
     filter_parameter_logging :password
 
+    def set_vary_header
+        response.headers['Vary'] = 'Cookie'
+    end
+    
+    helper_method :anonymous_cache, :short_cache, :medium_cache, :long_cache
+    def anonymous_cache(time)
+        if session[:user_id].nil?
+            expires_in time, :public => true
+        end
+    end
+
+    def short_cache
+        anonymous_cache(60.seconds)
+    end
+
+    def medium_cache
+        anonymous_cache(60.minutes)
+    end
+
+    def long_cache
+        anonymous_cache(24.hours)
+    end
 
     def set_gettext_locale
         requested_locale = params[:locale] || session[:locale] || cookies[:locale] ||  request.env['HTTP_ACCEPT_LANGUAGE']
@@ -46,12 +68,17 @@ class ApplicationController < ActionController::Base
     # egrep "CONSUME MEMORY: [0-9]{7} KB" production.log
     around_filter :record_memory
     def record_memory
-        File.read("/proc/#{Process.pid}/status").match(/VmRSS:\s+(\d+)/)
-        rss_before_action = $1.to_i
-        yield
-        File.read("/proc/#{Process.pid}/status").match(/VmRSS:\s+(\d+)/)
-        rss_after_action = $1.to_i
-        logger.info("PID: #{Process.pid}\tCONSUME MEMORY: #{rss_after_action - rss_before_action} KB\tNow: #{rss_after_action} KB\t#{request.url}")
+        record_memory = MySociety::Config.get('DEBUG_RECORD_MEMORY', false)
+        if record_memory
+            File.read("/proc/#{Process.pid}/status").match(/VmRSS:\s+(\d+)/)
+            rss_before_action = $1.to_i
+            yield
+            File.read("/proc/#{Process.pid}/status").match(/VmRSS:\s+(\d+)/)
+            rss_after_action = $1.to_i
+            logger.info("PID: #{Process.pid}\tCONSUME MEMORY: #{rss_after_action - rss_before_action} KB\tNow: #{rss_after_action} KB\t#{request.url}")
+        else
+            yield
+        end
     end
 
     # Set cookie expiry according to "remember me" checkbox, as per "An easier