From c210b7c26ce8bbde894733dc04d215d423b6418c Mon Sep 17 00:00:00 2001 From: Neil Smith Date: Thu, 23 Jul 2009 21:32:47 +0000 Subject: [PATCH] Merged updates into stable branch --- config/environment.rb | 2 +- config/environments/production.rb | 3 +++ config/routes.rb | 8 ++++++-- heaaders.txt | 10 ---------- headers.txt | 10 ---------- 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 heaaders.txt delete mode 100644 headers.txt diff --git a/config/environment.rb b/config/environment.rb index ff450c7..8c6dee4 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION +# RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') diff --git a/config/environments/production.rb b/config/environments/production.rb index 27119d2..a3f3c4a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -15,6 +15,9 @@ config.action_view.cache_template_loading = true # Use a different logger for distributed setups # config.logger = SyslogLogger.new +# Rotate logs when the file grows to 10Mb, keep 10 old log files +config.logger = Logger.new(config.log_path, 10, 10.megabytes) + # Use a different cache store in production # config.cache_store = :mem_cache_store diff --git a/config/routes.rb b/config/routes.rb index 1240ec4..75eb181 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -38,12 +38,16 @@ ActionController::Routing::Routes.draw do |map| :conditions => { :method => :get }, :controller => 'feed', :action => 'show' - map.update ':ignored', + map.update '*ignored', :conditions => { :method => :post }, - :defaults => { :ignored => nil }, + #:defaults => { :ignored => nil }, :controller => 'feed', :action => 'update' + map.connect '*ignored', + :controller => 'feed', + :action => 'index' + # You can have the root of your site routed with map.root -- just remember to delete public/index.html. map.root :controller => "feed" diff --git a/heaaders.txt b/heaaders.txt deleted file mode 100644 index bd7c636..0000000 --- a/heaaders.txt +++ /dev/null @@ -1,10 +0,0 @@ -HTTP/1.1 200 OK -Cache-Control: private, max-age=0, must-revalidate -Connection: Keep-Alive -Date: Wed, 22 Jul 2009 12:44:26 GMT -Content-Type: application/rss+xml; charset=utf-8 -Etag: "e7d0d2fad560d3d17bc9fa379dff26d7" -Server: WEBrick/1.3.1 (Ruby/1.8.6/2007-09-24) -X-Runtime: 33 -Content-Length: 710 - diff --git a/headers.txt b/headers.txt deleted file mode 100644 index 8ff770c..0000000 --- a/headers.txt +++ /dev/null @@ -1,10 +0,0 @@ -HTTP/1.1 200 OK -Cache-Control: private, max-age=0, must-revalidate -Connection: Keep-Alive -Date: Wed, 22 Jul 2009 12:46:46 GMT -Content-Type: application/rss+xml; charset=utf-8 -Etag: "0fcd2f586381d34c341be820ea75fa9a" -Server: WEBrick/1.3.1 (Ruby/1.8.6/2007-09-24) -X-Runtime: 67 -Content-Length: 2528 - -- 2.34.1