From 10b83629d04b611b2ac6c00991d48c6c22fbdd66 Mon Sep 17 00:00:00 2001 From: Kyle Drake Date: Sat, 13 Jul 2013 17:32:57 +0200 Subject: [PATCH] more fixes, remove debug code --- app.rb | 7 +++---- views/error.slim | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app.rb b/app.rb index ccc6c286..a34f04a6 100644 --- a/app.rb +++ b/app.rb @@ -20,10 +20,10 @@ error do EmailWorker.perform_async({ from: 'web@neocities.org', to: 'errors@neocities.org', - subject: "[NeoCities Error] #{env['sinatra.error'].message}", - body: "#{request.method} #{request.path}\n\n" + + subject: "[NeoCities Error] #{env['sinatra.error'].class}: #{env['sinatra.error'].message}", + body: "#{request.request_method} #{request.path}\n\n" + (current_site ? "Site: #{current_site.username}\nEmail: #{current_site.email}\n\n" : '') + - env['sinatra.error'].backtrace.to_s + env['sinatra.error'].backtrace.join("\n") }) slim :'error' @@ -436,7 +436,6 @@ get '/password_reset_confirm' do end get '/contact' do - raise 'hell' slim :'contact' end diff --git a/views/error.slim b/views/error.slim index fb40b6de..d6014adc 100644 --- a/views/error.slim +++ b/views/error.slim @@ -1,5 +1,6 @@ .row .span8.offset2.text-center h2 Site Error - h4 There has been an error performing the requested action. We have been notified of the problem. - h5 If you need to add any special information or if this error has not been resolved in a while, contact us and report the problem. Thank you! \ No newline at end of file + h4 There has been an error performing the requested action. + h4 We have been notified of the problem. + h5 If you need to add any special information or if this error has not been resolved in a while, contact us and report the problem. Thank you!