mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-05 02:08:57 +09:00
52540771b0
Nil unwrap causes the admin dashboard to crash/500 when the Chewy client info version number value is nil. This occurs when running another ES-compatible backend such as MeiliSearch. Obviously it would be good for chewy to recognise upstream but at least avoiding the crash would be fine.
41 lines
992 B
Ruby
41 lines
992 B
Ruby
# frozen_string_literal: true
|
|
|
|
class Admin::SystemCheck::ElasticsearchCheck < Admin::SystemCheck::BaseCheck
|
|
def skip?
|
|
!current_user.can?(:view_devops)
|
|
end
|
|
|
|
def pass?
|
|
return true unless Chewy.enabled?
|
|
|
|
running_version.present? && compatible_version?
|
|
end
|
|
|
|
def message
|
|
if running_version.present?
|
|
Admin::SystemCheck::Message.new(:elasticsearch_version_check, I18n.t('admin.system_checks.elasticsearch_version_check.version_comparison', running_version: running_version, required_version: required_version))
|
|
else
|
|
Admin::SystemCheck::Message.new(:elasticsearch_running_check)
|
|
end
|
|
end
|
|
|
|
private
|
|
|
|
def running_version
|
|
@running_version ||= begin
|
|
Chewy.client.info['version']['number']
|
|
rescue Faraday::ConnectionFailed
|
|
nil
|
|
end
|
|
end
|
|
|
|
def required_version
|
|
'7.x'
|
|
end
|
|
|
|
def compatible_version?
|
|
return false if running_version.nil?
|
|
Gem::Version.new(running_version) >= Gem::Version.new(required_version)
|
|
end
|
|
end
|