From 9853601ffbb22b39f1c862d983ba7af375db541b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B1=E5=8D=9A=E4=BA=9E?= Date: Sat, 24 Feb 2024 21:17:48 +0800 Subject: [PATCH] Prepare to support ruby 3.3. --- lib/feeds/engine.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/feeds/engine.rb b/lib/feeds/engine.rb index 6b5dfc7..fba8415 100644 --- a/lib/feeds/engine.rb +++ b/lib/feeds/engine.rb @@ -2,8 +2,9 @@ module Feeds class Engine < ::Rails::Engine initializer "feeds" do Rails.application.config.to_prepare do + gem_root = Feeds::Engine.root if ENV['worker_num']=='0' && File.basename($0) != 'rake' && !Rails.const_defined?('Console') - require File.expand_path('../../../app/models/site_feed_setting', __FILE__) + require File.join(gem_root, 'app/models/site_feed_setting') if defined?(SiteFeedSetting) if SiteFeedSetting.count==0 SiteFeedSetting.create @@ -52,7 +53,6 @@ module Feeds end end - gem_root = Feeds::Engine.root gem_tmp = File.join(gem_root, 'tmp') f = File.join(gem_tmp, "install_bash") if File.exist?(f)