incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wso...@apache.org
Subject svn commit: r754681 - in /incubator/olio/webapp/rails/branches/caching: app/controllers/events_controller.rb config/environment.rb config/environments/production.rb vendor/plugins/extended_fragment_cache/
Date Sun, 15 Mar 2009 16:07:46 GMT
Author: wsobel
Date: Sun Mar 15 16:07:45 2009
New Revision: 754681

URL: http://svn.apache.org/viewvc?rev=754681&view=rev
Log:
Fix for OLIO-59: Removed old extended fragment cache

Removed:
    incubator/olio/webapp/rails/branches/caching/vendor/plugins/extended_fragment_cache/
Modified:
    incubator/olio/webapp/rails/branches/caching/app/controllers/events_controller.rb
    incubator/olio/webapp/rails/branches/caching/config/environment.rb
    incubator/olio/webapp/rails/branches/caching/config/environments/production.rb

Modified: incubator/olio/webapp/rails/branches/caching/app/controllers/events_controller.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/branches/caching/app/controllers/events_controller.rb?rev=754681&r1=754680&r2=754681&view=diff
==============================================================================
--- incubator/olio/webapp/rails/branches/caching/app/controllers/events_controller.rb (original)
+++ incubator/olio/webapp/rails/branches/caching/app/controllers/events_controller.rb Sun
Mar 15 16:07:45 2009
@@ -9,9 +9,6 @@
   MAX_ATTENDEES = 20
   
   if CACHED
-  # Turned off for memcached
-    protect_from_forgery :only => [:update, :destroy, :delete, :create] unless Memcached
-
     after_filter :expire_home, :only => :index
     after_filter :expire_calendar, :only => :update_calendar
     after_filter :expire_tag, :only => :tag

Modified: incubator/olio/webapp/rails/branches/caching/config/environment.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/branches/caching/config/environment.rb?rev=754681&r1=754680&r2=754681&view=diff
==============================================================================
--- incubator/olio/webapp/rails/branches/caching/config/environment.rb (original)
+++ incubator/olio/webapp/rails/branches/caching/config/environment.rb Sun Mar 15 16:07:45
2009
@@ -12,17 +12,11 @@
 require 'hodel_3000_compliant_logger'
 
 CACHED = true
-Memcached = true
+MEMCACHED = true
 
 IMAGE_STORE_PATH = 'public/uploaded_files'
 DOCUMENT_STORE_PATH = 'public/uploaded_files'
 
-if CACHED and Memcached
-  require 'memcache'
-  CACHE = MemCache.new :c_threshold => 1_000,:compression => true,:debug => false,:namespace
=> 'mycachespace',:readonly => false,:urlencode => false
-  CACHE.servers = 'r5:11211'
-end
-
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here
 
@@ -56,12 +50,6 @@
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 
-  # Memcached Config ## START ##
-  if CACHED and Memcached
-    config.action_controller.cache_store = CACHE
-  end
-  # Memcached Config ## END ##
-
   config.action_controller.session = {
     :session_key => '_perf_session',
     :secret      => 'dab95a8389324e5fa99cf6b178d4377d320b3c94ac2af58946b59118b92d2149a3091bbada03862361ee401e594279022b15fdaeee0df45ee17de07caa912576'

Modified: incubator/olio/webapp/rails/branches/caching/config/environments/production.rb
URL: http://svn.apache.org/viewvc/incubator/olio/webapp/rails/branches/caching/config/environments/production.rb?rev=754681&r1=754680&r2=754681&view=diff
==============================================================================
--- incubator/olio/webapp/rails/branches/caching/config/environments/production.rb (original)
+++ incubator/olio/webapp/rails/branches/caching/config/environments/production.rb Sun Mar
15 16:07:45 2009
@@ -17,8 +17,8 @@
 
 # Disable delivery errors, bad email addresses will be ignored
 if CACHED
-  if Memcached
-    config.action_controller.cache_store = :mem_cache_store
+  if MEMCACHED
+    config.action_controller.cache_store = :mem_cache_store, 'r5.millennium.berkeley,edu'
   else
     config.action_mailer.raise_delivery_errors = false
     config.action_controller.cache_store = :file_store, RAILS_ROOT + '/tmp/cache/'



Mime
View raw message