lib/castronaut/configuration.rb in relevance-castronaut-0.3.6 vs lib/castronaut/configuration.rb in relevance-castronaut-0.4.1
- old
+ new
@@ -20,11 +20,11 @@
config.config_file_path = config_file_path
config.config_hash = parse_yaml_config(config_file_path)
config.parse_config_into_settings(config.config_hash)
config.logger = config.setup_logger
config.debug_initialize if config.logger.debug?
- config.connect_activerecord
+ config.connect_activerecord
config
end
def self.parse_yaml_config(file_path)
YAML::load_file(file_path)
@@ -71,10 +71,10 @@
ActiveRecord::Base.logger = logger
ActiveRecord::Base.colorize_logging = false
connect_cas_to_activerecord
- connect_adapter_to_activerecord
+ connect_adapter_to_activerecord if cas_adapter.has_key?('database')
end
def connect_cas_to_activerecord
logger.info "#{self.class} - Connecting to cas database using #{cas_database.inspect}"
ActiveRecord::Base.establish_connection(cas_database)