lib/snails/mailer.rb in snails-0.1.4 vs lib/snails/mailer.rb in snails-0.1.5

- old
+ new

@@ -20,10 +20,11 @@ puts "Private key for DKIM not found! Disabling..." mail_config.delete(:dkim) end Tuktuk.options = mail_config + @debug = mail_config[:debug] @from_email = opts[:from] or raise ":from required" @base_subject = opts[:base_subject] || '' @views = opts[:views] || Snails.root.join('lib', 'views') @logfile = opts[:logfile] # || Snails.root.join('log', 'mailer.log') end @@ -108,11 +109,12 @@ if html_body or html_template message[:html_body] = html_template ? render(html_template) : html_body end - logger.info "[#{to}] Delivering: #{subject}" # debug - resp, email = Tuktuk.deliver(message, debug: !Snails.env.production?) + logger.info "[#{to}] Delivering: #{subject}" + debug = @debug.nil? ? !Snails.env.production? : @debug # if debug isn't set, determine based on env + resp, email = Tuktuk.deliver(message, debug: debug) if resp.is_a?(Tuktuk::Bounce) logger.info "[#{to}] Email bounced! [#{resp.code}] #{resp.message}" end \ No newline at end of file