haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

core: Tweak host/guest capability logging 

- Use downcase logger name as everywhere else
- Remove duplicate logging from the Guest
This commit is contained in:
Teemu Matilainen 2014-01-09 00:53:39 -03:00
parent f1d71f9481
commit c638df9dcb
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/vagrant/capability_host.rb
View File

@ -25,7 +25,8 @@ module Vagrant
# is a hash where the key is the name of the capability and the value # is a hash where the key is the name of the capability and the value
# is the class/module implementing it. # is the class/module implementing it.
def initialize_capabilities!(host, hosts, capabilities, *args) def initialize_capabilities!(host, hosts, capabilities, *args)
@cap_logger = Log4r::Logger.new("vagrant::capability_host::#{self.class}") @cap_logger = Log4r::Logger.new(
"vagrant::capability_host::#{self.class.to_s.downcase}")
if host && !hosts[host] if host && !hosts[host]
raise Errors::CapabilityHostExplicitNotDetected, value: host.to_s raise Errors::CapabilityHostExplicitNotDetected, value: host.to_s
@ -113,7 +114,7 @@ module Vagrant
protected protected
def autodetect_capability_host(hosts, *args) def autodetect_capability_host(hosts, *args)
@cap_logger.info("Autodetecting guest for machine: #{@machine}") @cap_logger.info("Autodetecting host type for #{args.inspect}")
# Get the mapping of hosts with the most parents. We start searching # Get the mapping of hosts with the most parents. We start searching
# with the hosts with the most parents first. # with the hosts with the most parents first.

3
lib/vagrant/guest.rb
View File

@ -22,7 +22,6 @@ module Vagrant
include CapabilityHost include CapabilityHost
def initialize(machine, guests, capabilities) def initialize(machine, guests, capabilities)
@logger = Log4r::Logger.new("vagrant::guest")
@capabilities = capabilities @capabilities = capabilities
@guests = guests @guests = guests
@machine = machine @machine = machine
@ -31,8 +30,6 @@ module Vagrant
# This will detect the proper guest OS for the machine and set up # This will detect the proper guest OS for the machine and set up
# the class to actually execute capabilities. # the class to actually execute capabilities.
def detect! def detect!
@logger.info("Detect guest for machine: #{@machine}")
guest_name = @machine.config.vm.guest guest_name = @machine.config.vm.guest
initialize_capabilities!(guest_name, @guests, @capabilities, @machine) initialize_capabilities!(guest_name, @guests, @capabilities, @machine)
end end