From 1e3ad9e98881625d4ecdb24dc3c21573369d4a2d Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 13 Apr 2023 09:30:00 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=EF=BC=9A=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/webhook/client.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/services/webhook/client.rb b/app/services/webhook/client.rb index a64753d05..ac7cfcf35 100644 --- a/app/services/webhook/client.rb +++ b/app/services/webhook/client.rb @@ -49,11 +49,19 @@ module Webhook::Client @request_content["http_method"] = @http_method @request_content["headers"] = headers - response = RestClient::Request.execute(method: trans_http_method, url: @url, headers: headers, payload: @webhook_task.read_attribute_before_type_cast("payload_content")) {|response, request, result| response } + begin - @response_content["status"] = response.code - @response_content["headers"] = response.headers - @response_content["body"] = response.body.to_json + response = RestClient::Request.execute(method: trans_http_method, url: @url, headers: headers, payload: @webhook_task.read_attribute_before_type_cast("payload_content")) {|response, request, result| response } + + @response_content["status"] = response.code + @response_content["headers"] = response.headers + @response_content["body"] = response.body.to_json + + rescue => e + @response_content["status"] = 500 + @response_content["headers"] = {} + @response_content["body"] = e.message + end @webhook_task.update_attributes({ delivered: Time.now.to_i * 1000000000,