From 558707f61a34e1cd7e0f4e537ff23fe354048bba Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sat, 3 Sep 2005 23:05:58 +0000
Subject: Silence logger initialization

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2127 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 railties/environments/environment.rb | 4 +++-
 railties/fresh_rakefile              | 4 ++--
 railties/lib/initializer.rb          | 2 ++
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'railties')

diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 6e2c616032..69951abee6 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -4,4 +4,6 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 Rails::Initializer.run do |config|
   # See Rails::Configuration for options
-end
\ No newline at end of file
+end
+
+# Include your application configuration below
\ No newline at end of file
diff --git a/railties/fresh_rakefile b/railties/fresh_rakefile
index 1a0c6bee61..02189e151a 100755
--- a/railties/fresh_rakefile
+++ b/railties/fresh_rakefile
@@ -1,5 +1,5 @@
-# Add your own tasks in files placed in config/tasks 
-# and they will automatically be available to Rake.
+# Add your own tasks in files placed in config/tasks ending in .rake,
+# for example config/tasks/switchtower.rake, and they will automatically be available to Rake.
 
 require(File.join(File.dirname(__FILE__), 'config', 'boot'))
 Rails::Initializer.run(:set_load_path)
diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb
index f54fb1aed3..37669adb42 100644
--- a/railties/lib/initializer.rb
+++ b/railties/lib/initializer.rb
@@ -73,7 +73,9 @@ module Rails
         )
       end
       
+      old_verbose, $VERBOSE = $VERBOSE, nil
       Object.const_set "RAILS_DEFAULT_LOGGER", logger
+      $VERBOSE = old_verbose
     end
     
     def initialize_framework_logging
-- 
cgit v1.2.3