database.rb in adhearsion-0.8.5

- old
+ new

@@ -12,10 +12,14 @@
           require_models
           @@config = Adhearsion::AHN_CONFIG.database
           # You may need to uncomment the following line for older versions of ActiveRecord
           # ActiveRecord::Base.allow_concurrency = true
           establish_connection
+          ActiveRecord::Base.logger =
+            @@config.connection_options.has_key?(:logger) ?
+              @@config.connection_options[:logger] :
+              ahn_log.db
           create_call_hook_for_connection_cleanup
         end
 
         def stop
           ActiveRecord::Base.remove_connection
@@ -28,10 +32,16 @@
             ActiveRecord::Base.verify_active_connections!
           end
         end
 
         def require_dependencies
-          require 'active_record'
+          begin
+            require 'active_record'
+          rescue LoadError
+            ahn_log.fatal "Database support requires the \"activerecord\" gem."
+            # Silence the abort so we don't get an ugly backtrace
+            abort ""
+          end
         end
 
         def require_models
           AHN_CONFIG.files_from_setting("paths", "models").each do |model|
             load model
\ No newline at end of file