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

Add in some logging

This commit is contained in:
Mitchell Hashimoto 2012-11-14 16:21:12 -08:00
parent 819140bbc2
commit c9d5cff7be
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/vagrant/environment.rb
View File

@ -147,12 +147,18 @@ module Vagrant
# backed by. # backed by.
# @return [Machine] # @return [Machine]
def machine(name, provider) def machine(name, provider)
@logger.info("Getting machine: #{name} (#{provider})")
# Compose the cache key of the name and provider, and return from # Compose the cache key of the name and provider, and return from
# the cache if we have that. # the cache if we have that.
cache_key = [name, provider] cache_key = [name, provider]
@machines ||= {} @machines ||= {}
return @machines[cache_key] if @machines.has_key?(cache_key) if @machines.has_key?(cache_key)
@logger.info("Returning cached machine: #{name} (#{provider})")
return @machines[cache_key]
end
@logger.info("Uncached load of machine.")
sub_vm = config_global.vm.defined_vms[name] sub_vm = config_global.vm.defined_vms[name]
if !sub_vm if !sub_vm
raise Errors::MachineNotFound, :name => name, :provider => provider raise Errors::MachineNotFound, :name => name, :provider => provider
@ -189,6 +195,7 @@ module Vagrant
if box_vagrantfile if box_vagrantfile
# The box has a custom Vagrantfile, so we load that into the config # The box has a custom Vagrantfile, so we load that into the config
# as well. # as well.
@logger.info("Box exists with Vagrantfile. Reloading machine config.")
box_config_key = "box_#{box.name}_#{box.provider}".to_sym box_config_key = "box_#{box.name}_#{box.provider}".to_sym
@config_loader.set(box_config_key, box_vagrantfile) @config_loader.set(box_config_key, box_vagrantfile)
config = @config_loader.load([:default, box_config_key, :home, :root, vm_config_key]) config = @config_loader.load([:default, box_config_key, :home, :root, vm_config_key])