mirror of
https://github.com/discourse/discourse.git
synced 2025-08-21 19:11:18 +08:00
FEATURE: Support backup uploads/downloads directly to/from S3.
This reverts commit 3c59106bac
.
This commit is contained in:
parent
6a59187ae8
commit
84d4c81a26
52 changed files with 1079 additions and 420 deletions
|
@ -24,6 +24,12 @@ module JsonError
|
|||
# If we're passed an array, it's an array of error messages
|
||||
return { errors: obj.map(&:to_s) } if obj.is_a?(Array) && obj.present?
|
||||
|
||||
if obj.is_a?(Exception)
|
||||
message = obj.cause.message.presence || obj.cause.class.name if obj.cause
|
||||
message = obj.message.presence || obj.class.name if message.blank?
|
||||
return { errors: [message] } if message.present?
|
||||
end
|
||||
|
||||
# Log a warning (unless obj is nil)
|
||||
Rails.logger.warn("create_errors_json called with unrecognized type: #{obj.inspect}") if obj
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue