diff options
| author | Christoph Helma <helma@in-silico.ch> | 2011-05-30 08:17:43 +0000 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2011-05-30 08:17:43 +0000 |
| commit | 1dbf257583fb68658f4ba4ecde3602ebef07e540 (patch) | |
| tree | dffe6f6cc03920f1aa5fabe659bca71436789cd3 | |
| parent | 24df87ffb307af4dbff9a19af43734e0f02b81eb (diff) | |
mail exceptions disabled
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | lib/config/config_ru.rb | 2 | ||||
| -rw-r--r-- | lib/environment.rb | 2 |
3 files changed, 4 insertions, 2 deletions
@@ -25,7 +25,7 @@ begin gem.add_dependency "spreadsheet", "=0.6.5.4" gem.add_dependency "google-spreadsheet-ruby", "=0.1.5" gem.add_dependency "yajl-ruby", "=0.8.2" - gem.add_dependency "tmail", "=1.2.7.1" + #gem.add_dependency "mail", "=2.3.0" gem.add_dependency "rinruby", "=2.0.2" gem.add_dependency "ohm", "=0.1.3" gem.add_dependency "ohm-contrib", "=0.1.1" diff --git a/lib/config/config_ru.rb b/lib/config/config_ru.rb index 93df867..dc04263 100644 --- a/lib/config/config_ru.rb +++ b/lib/config/config_ru.rb @@ -19,6 +19,7 @@ set :lock, true end use Rack::ShowExceptions +=begin if defined?(MAIL) # monkeypatch with the original method @@ -50,3 +51,4 @@ if defined?(MAIL) mail.smtp MAIL end end +=end diff --git a/lib/environment.rb b/lib/environment.rb index ffc4f60..28a9a66 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -27,7 +27,7 @@ end 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") +#load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") logfile = "#{LOG_DIR}/#{ENV["RACK_ENV"]}.log" #LOGGER = OTLogger.new(logfile,'daily') # daily rotation |