Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix symlinked plugin watching (#38417)

Jarek Radoszfe25c9fdb696
diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
index 4de61e08a6b..6f77dc7660e 100644
--- a/lib/plugin/instance.rb
+++ b/lib/plugin/instance.rb
@@ -71,6 +71,15 @@ class Plugin::Instance
File.dirname(path)
end
+ def resolved_dir
+ @resolved_dir ||=
+ if File.symlink?(root_dir)
+ File.expand_path(File.readlink(root_dir), "#{Rails.root}/plugins")
+ else
+ root_dir
+ end
+ end
+
def seed_data
@seed_data ||= ActiveSupport::HashWithIndifferentAccess.new({})
end
diff --git a/lib/plugin/js_manager.rb b/lib/plugin/js_manager.rb
index 12fe506593c..7226d2a4ae1 100644
--- a/lib/plugin/js_manager.rb
+++ b/lib/plugin/js_manager.rb
@@ -170,7 +170,7 @@ module Plugin
relative_path = Pathname.new(file).relative_path_from(Rails.root)
log "- #{relative_path}"
- plugin = Discourse.plugins.find { |p| file.start_with?(p.directory) }
+ plugin = Discourse.plugins.find { |p| file.start_with?(p.resolved_dir) }
changed_plugins << plugin if plugin
end