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

Always load protos regardless of server mode

Browse Source
This commit is contained in:
Chris Roberts 2022-12-08 11:42:51 -08:00
parent 1cd6ac3b31
commit e2165917e5
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/vagrant.rb
View File

@ -39,11 +39,27 @@ module VagrantPlugins
OptionParser = Vagrant::OptionParser OptionParser = Vagrant::OptionParser
end end
# Load in our helpers and utilities
require "vagrant/shared_helpers" require "vagrant/shared_helpers"
require "rubygems" require "rubygems"
require "vagrant/util" require "vagrant/util"
require "vagrant/plugin/manager" require "vagrant/plugin/manager"
# Update the load path so our protos can be located
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
# Load our protos so they are available
require 'vagrant/protobufs/proto/vagrant_server/server_pb'
require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
# Enable logging if it is requested. We do this before # Enable logging if it is requested. We do this before
# anything else so that we can setup the output before # anything else so that we can setup the output before
# any logging occurs. # any logging occurs.

13
lib/vagrant/shared_helpers.rb
View File

@ -235,19 +235,6 @@ module Vagrant
# @return [true] # @return [true]
def self.enable_server_mode! def self.enable_server_mode!
if !server_mode? if !server_mode?
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
require 'vagrant/protobufs/proto/vagrant_server/server_pb'
require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
SERVER_MODE_CALLBACKS.each(&:call) SERVER_MODE_CALLBACKS.each(&:call)
Util::HCLogOutputter.new("hclog") Util::HCLogOutputter.new("hclog")
Log4r::Outputter["hclog"].formatter = Util::HCLogFormatter.new Log4r::Outputter["hclog"].formatter = Util::HCLogFormatter.new