From 1dbf257583fb68658f4ba4ecde3602ebef07e540 Mon Sep 17 00:00:00 2001 From: Christoph Helma Date: Mon, 30 May 2011 08:17:43 +0000 Subject: mail exceptions disabled --- Rakefile | 2 +- lib/config/config_ru.rb | 2 ++ lib/environment.rb | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index f402e0d..4fb851e 100644 --- a/Rakefile +++ b/Rakefile @@ -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 -- cgit v1.2.3