Permalink
Browse files

Added tmp/sessions, tmp/cache, and tmp/sockets as default directories…

… in the Rails skeleton [DHH] Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) [DHH] Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration [DHH] Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3645 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Feb 25, 2006
1 parent 63f188c commit 1aea4704dca570e3ef7abe69349ae2f161c7244b
View
@@ -1,5 +1,13 @@
*SVN*
+* Changed the default configuration for lighttpd to use tmp/sockets instead of log/ for the FastCGI sockets [DHH]
+
+* Added a default configuration of the FileStore for fragment caching if tmp/cache is available, which makes action/fragment caching ready to use out of the box with no additional configuration [DHH]
+
+* Changed the default session configuration to place sessions in tmp/sessions, if that directory is available, instead of /tmp (this essentially means a goodbye to 9/10 White Screen of Death errors and should have web hosting firms around the world cheering) [DHH]
+
+* Added tmp/sessions, tmp/cache, and tmp/sockets as default directories in the Rails skeleton [DHH]
+
* Added that script/generate model will now automatically create a migration file for the model created. This can be turned off by calling the generator with --skip-migration [DHH]
* Added -d/--database option to the rails command, so you can do "rails --database=sqlite2 myapp" to start a new application preconfigured to use SQLite2 as the database. Removed the configuration examples from SQLite and PostgreSQL from the default MySQL configuration [DHH]
View
@@ -28,7 +28,11 @@ RUBY_FORGE_USER = "webster132"
# end
-BASE_DIRS = %w( app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins )
+BASE_DIRS = %w(
+ app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins
+ tmp/sessions tmp/cache tmp/sockets
+)
+
APP_DIRS = %w( models controllers helpers views views/layouts )
PUBLIC_DIRS = %w( images javascripts stylesheets )
TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test )
@@ -19,7 +19,7 @@ fastcgi.server = ( ".fcgi" =>
(
"min-procs" => 1,
"max-procs" => 1,
- "socket" => CWD + "/log/fcgi.socket",
+ "socket" => CWD + "/tmp/sockets/fcgi.socket",
"bin-path" => CWD + "/public/dispatch.fcgi",
"bin-environment" => ( "RAILS_ENV" => "development" )
)
@@ -20,10 +20,6 @@
# (by default production uses :info, the others :debug)
# config.log_level = :debug
- # Enable page/fragment caching by setting a file-based store
- # (remember to create the caching directory and make it readable to the application)
- # config.action_controller.fragment_cache_store = :file_store, "#{RAILS_ROOT}/cache"
-
# Use the database for sessions instead of the file system
# (create the session table with 'rake create_sessions_table')
# config.action_controller.session_store = :active_record_store
@@ -87,7 +87,8 @@ def process
initialize_dependency_mechanism
initialize_breakpoints
initialize_whiny_nils
-
+ initialize_temporary_directories
+
initialize_framework_settings
# Support for legacy configuration style where the environment
@@ -248,6 +249,18 @@ def initialize_whiny_nils
require('active_support/whiny_nil') if configuration.whiny_nils
end
+ def initialize_temporary_directories
+ if configuration.frameworks.include?(:action_controller)
+ session_path = "#{RAILS_ROOT}/tmp/sessions/"
+ ActionController::Base.session_options[:tmpdir] = File.exist?(session_path) ? session_path : Dir::tmpdir
+
+ cache_path = "#{RAILS_ROOT}/tmp/cache/"
+ if File.exist?(cache_path)
+ ActionController::Base.fragment_cache_store = :file_store, cache_path
+ end
+ end
+ end
+
# Initializes framework-specific settings for each of the loaded frameworks
# (Configuration#frameworks). The available settings map to the accessors
# on each of the corresponding Base classes.
@@ -309,8 +309,9 @@ def readme(*relative_sources)
# When creating a migration, it knows to find the first available file in db/migrate and use the migration.rb template.
def migration_template(relative_source, relative_destination, template_options = {})
migration_directory relative_destination
- raise "Another migration is already named #{file_name}: #{existing_migrations(file_name).first}" if migration_exists?(file_name)
- template(relative_source, "#{relative_destination}/#{next_migration_string}_#{file_name}.rb", template_options)
+ migration_file_name = template_options[:migration_file_name] || file_name
+ raise "Another migration is already named #{migration_file_name}: #{existing_migrations(migration_file_name).first}" if migration_exists?(migration_file_name)
+ template(relative_source, "#{relative_destination}/#{next_migration_string}_#{migration_file_name}.rb", template_options)
end
private
@@ -129,6 +129,9 @@ def mysql_socket_location
test/unit
vendor
vendor/plugins
+ tmp/sessions
+ tmp/sockets
+ tmp/cache
)
MYSQL_SOCKET_LOCATIONS = [
@@ -19,7 +19,7 @@ def manifest
unless options[:skip_migration]
m.migration_template 'migration.rb', 'db/migrate', :assigns => {
:migration_name => "Add#{class_name.pluralize}"
- }
+ }, :migration_file_name => "add_#{file_name.pluralize}"
end
end
end

0 comments on commit 1aea470

Please sign in to comment.