From 441f82760b78da95c152e9b58f5bb0425e6563a0 Mon Sep 17 00:00:00 2001 From: sophia Date: Wed, 5 Jan 2022 14:54:57 -0600 Subject: [PATCH] Include exception logger and attach to all available methods --- plugins/commands/serve/service/capability_platform_service.rb | 2 +- plugins/commands/serve/service/command_service.rb | 2 +- plugins/commands/serve/service/communicator_service.rb | 2 +- plugins/commands/serve/service/internal_service.rb | 2 +- plugins/commands/serve/service/provider_service.rb | 2 +- plugins/commands/serve/util/exception_logger.rb | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/commands/serve/service/capability_platform_service.rb b/plugins/commands/serve/service/capability_platform_service.rb index ab07607fa..9bda931c4 100644 --- a/plugins/commands/serve/service/capability_platform_service.rb +++ b/plugins/commands/serve/service/capability_platform_service.rb @@ -11,7 +11,7 @@ module VagrantPlugins klass.prepend(Util::HasMapper) klass.prepend(Util::HasBroker) klass.prepend(Util::HasLogger) - klass.prepend(Util::ExceptionLogger) + klass.include(Util::ExceptionLogger) klass.class_eval do attr_reader :capabilities, :default_args diff --git a/plugins/commands/serve/service/command_service.rb b/plugins/commands/serve/service/command_service.rb index a8fe07b29..587cc336d 100644 --- a/plugins/commands/serve/service/command_service.rb +++ b/plugins/commands/serve/service/command_service.rb @@ -10,7 +10,7 @@ module VagrantPlugins prepend Util::HasMapper prepend Util::HasBroker prepend Util::HasLogger - prepend Util::ExceptionLogger + include Util::ExceptionLogger def command_info_spec(*args) SDK::FuncSpec.new diff --git a/plugins/commands/serve/service/communicator_service.rb b/plugins/commands/serve/service/communicator_service.rb index 52d0e506c..4fc5e4285 100644 --- a/plugins/commands/serve/service/communicator_service.rb +++ b/plugins/commands/serve/service/communicator_service.rb @@ -8,9 +8,9 @@ module VagrantPlugins prepend Util::HasMapper prepend Util::HasBroker - prepend Util::ExceptionLogger prepend Util::HasLogger include Util::HasSeeds::Service + include Util::ExceptionLogger def initialize(*args, **opts, &block) super() diff --git a/plugins/commands/serve/service/internal_service.rb b/plugins/commands/serve/service/internal_service.rb index a93725bab..205f4d756 100644 --- a/plugins/commands/serve/service/internal_service.rb +++ b/plugins/commands/serve/service/internal_service.rb @@ -12,7 +12,7 @@ module VagrantPlugins class InternalService < Hashicorp::Vagrant::RubyVagrant::Service prepend Util::HasBroker prepend Util::HasLogger - prepend Util::ExceptionLogger + include Util::ExceptionLogger def get_plugins(req, _unused_call) plugins = [] diff --git a/plugins/commands/serve/service/provider_service.rb b/plugins/commands/serve/service/provider_service.rb index 7b184f69a..38797bd05 100644 --- a/plugins/commands/serve/service/provider_service.rb +++ b/plugins/commands/serve/service/provider_service.rb @@ -12,7 +12,7 @@ module VagrantPlugins prepend Util::HasMapper prepend Util::HasBroker prepend Util::HasLogger - prepend Util::ExceptionLogger + include Util::ExceptionLogger def usable(req, _unused_call) nil diff --git a/plugins/commands/serve/util/exception_logger.rb b/plugins/commands/serve/util/exception_logger.rb index 704d68771..a8790020f 100644 --- a/plugins/commands/serve/util/exception_logger.rb +++ b/plugins/commands/serve/util/exception_logger.rb @@ -3,8 +3,8 @@ module VagrantPlugins module Util # Adds exception logging to all public instance methods module ExceptionLogger - def self.prepended(klass) - klass.public_instance_methods(false).each do |m_name| + def self.included(klass) + klass.public_instance_methods.each do |m_name| klass.define_method(m_name) do |*args, **opts, &block| begin super(*args, **opts, &block)