Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge commit '9073ab59efe115a1a793de6e4e89a734a872bd99' into HEAD

  • Loading branch information...
commit cee9e15a56c1dc25ac275495e6fa140e144b6a42 2 parents 2dec6e4 + 9073ab5
Jenkins authored

Showing 2 changed files with 6 additions and 2 deletions. Show diff stats Hide diff stats

  1. +2 2 lib/app.rb
  2. +4 0 lib/zendesk_client.rb
4 lib/app.rb
@@ -142,7 +142,7 @@ def on_post(params, route)
142 142 if ticket
143 143 redirect '/acknowledge'
144 144 else
145   - ExceptionMailer.deliver_exception_notification(env['sinatra.error'])
  145 + ExceptionMailer.deliver_exception_notification(format_exception_message("There has been a problem", env['sinatra.error']))
146 146 500
147 147 end
148 148 else
@@ -151,7 +151,7 @@ def on_post(params, route)
151 151 end
152 152
153 153 error do
154   - ExceptionMailer.deliver_exception_notification(env['sinatra.error'])
  154 + ExceptionMailer.deliver_exception_notification(format_exception_message("There has been a problem", env['sinatra.error']))
155 155 500
156 156 end
157 157
4 lib/zendesk_client.rb
@@ -29,6 +29,10 @@ def self.get_client(logger)
29 29 if status_401 || too_many_login_attempts
30 30 raise ZendeskError.new("Authentication Error", env)
31 31 end
  32 +
  33 + if env[:body]["error"]
  34 + raise ZendeskError.new("Error creating ticket", env)
  35 + end
32 36 end
33 37
34 38 @client

0 comments on commit cee9e15

Please sign in to comment.
Something went wrong with that request. Please try again.