From 7eb09abebb91a567b081a651fce179acfadfb7c0 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Sat, 24 Nov 2007 18:20:40 -0600
Subject: Implementing the test for setting the Rails log level.

---
 lib/puppet/rails.rb | 45 +++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

(limited to 'lib')

diff --git a/lib/puppet/rails.rb b/lib/puppet/rails.rb
index 2af41f9f6..a1192bf20 100644
--- a/lib/puppet/rails.rb
+++ b/lib/puppet/rails.rb
@@ -8,29 +8,30 @@ module Puppet::Rails
     def self.connect
         # This global init does not work for testing, because we remove
         # the state dir on every test.
-        unless ActiveRecord::Base.connected?
-            Puppet.settings.use(:main, :rails, :puppetmasterd)
-
-            ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
-            begin
-                loglevel = Logger.const_get(Puppet[:rails_loglevel].upcase)
-                ActiveRecord::Base.logger.level = loglevel
-            rescue => detail
-                Puppet.warning "'%s' is not a valid Rails log level; using debug" % Puppet[:rails_loglevel]
-                ActiveRecord::Base.logger.level = Logger::DEBUG
-            end
-            ActiveRecord::Base.allow_concurrency = true
-            ActiveRecord::Base.verify_active_connections!
-
-            begin
-                ActiveRecord::Base.establish_connection(database_arguments())
-            rescue => detail
-                if Puppet[:trace]
-                    puts detail.backtrace
-                end
-                raise Puppet::Error, "Could not connect to database: %s" % detail
-            end 
+        return if ActiveRecord::Base.connected?
+
+        Puppet.settings.use(:main, :rails, :puppetmasterd)
+
+        ActiveRecord::Base.logger = Logger.new(Puppet[:railslog])
+        begin
+            loglevel = Logger.const_get(Puppet[:rails_loglevel].upcase)
+            ActiveRecord::Base.logger.level = loglevel
+        rescue => detail
+            Puppet.warning "'%s' is not a valid Rails log level; using debug" % Puppet[:rails_loglevel]
+            ActiveRecord::Base.logger.level = Logger::DEBUG
         end
+
+        ActiveRecord::Base.allow_concurrency = true
+        ActiveRecord::Base.verify_active_connections!
+
+        begin
+            ActiveRecord::Base.establish_connection(database_arguments())
+        rescue => detail
+            if Puppet[:trace]
+                puts detail.backtrace
+            end
+            raise Puppet::Error, "Could not connect to database: %s" % detail
+        end 
     end
 
     # The arguments for initializing the database connection.
-- 
cgit