diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-02-27 09:32:57 +0100 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-02-27 09:32:57 +0100 |
| commit | 9f91e5438a32f0b3b5b3755adfa20d4e0d36566b (patch) | |
| tree | 1885f5d053987cfc874f6223d4d612daa1f4303f /lib | |
| parent | d3dfccb8e46e1d5677877b833fa81acad4d026d4 (diff) | |
code cleanup
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/environment.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/environment.rb b/lib/environment.rb index 73df64e..4f04e48 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -23,10 +23,9 @@ else end # database +=begin if CONFIG[:database] ['dm-core', 'dm-serializer', 'dm-timestamps', 'dm-types', 'dm-migrations', 'dm-validations' ].each{|lib| require lib } -=begin -=end case CONFIG[:database][:adapter] when /sqlite/i db_dir = File.join(basedir, "db") @@ -52,9 +51,10 @@ if CONFIG[:database] #DataMapper.setup(:default, {:adapter => "redis"}) #DataMapper::Model.raise_on_save_failure = true - require 'ohm' - Ohm.connect :thread_safe => true end +=end +require 'ohm' +Ohm.connect :thread_safe => true # load mail settings for error messages load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") |