beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrap remote manager setup/teardown within usage tracker

Browse Source
This commit is contained in:
Chris Roberts 2022-01-11 11:37:52 -08:00 committed by Paul Hinze
parent d5cf2b66ed
commit dc03dd9cad
No known key found for this signature in database
GPG Key ID: B69DEDF2D55501C0
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugins/commands/serve/util/service_info.rb
View File

@ -14,11 +14,13 @@ module VagrantPlugins
broker: broker
)
if context.metadata["plugin_manager"] && info.broker
info.plugin_manager = Client::PluginManager.load(
context.metadata["plugin_manager"],
broker: info.broker
)
Vagrant.plugin("2").enable_remote_manager
Service::ServiceInfo.manager_tracker.activate do
info.plugin_manager = Client::PluginManager.load(
context.metadata["plugin_manager"],
broker: info.broker
)
Vagrant.plugin("2").enable_remote_manager
end
end
Thread.current.thread_variable_set(:service_info, info)
return if !block_given?
@ -27,7 +29,9 @@ module VagrantPlugins
rescue => e
raise "#{e.class}: #{e}\n#{e.backtrace.join("\n")}"
ensure
Vagrant.plugin("2").disable_remote_manager
Service::ServiceInfo.manager_tracker.deactivate do
Vagrant.plugin("2").disable_remote_manager
end
Thread.current.thread_variable_set(:service_info, nil)
end
end