Handle invalid log levels more gracefully
This commit is contained in:
parent
a7bde74cf3
commit
87b1a6660d
|
@ -1,12 +1,27 @@
|
||||||
# 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.
|
||||||
if ENV["VAGRANT_LOG"]
|
if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
|
||||||
require 'log4r'
|
require 'log4r'
|
||||||
|
|
||||||
|
level = nil
|
||||||
|
begin
|
||||||
|
level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
|
||||||
|
rescue NameError
|
||||||
|
# This means that the logging constant wasn't found,
|
||||||
|
# which is fine. We just keep `level` as `nil`. But
|
||||||
|
# we tell the user.
|
||||||
|
$stderr.puts "Invalid VAGRANT_LOG level is set: #{ENV["VAGRANT_LOG"}"
|
||||||
|
end
|
||||||
|
|
||||||
|
# Set the logging level on all "vagrant" namespaced
|
||||||
|
# logs as long as we have a valid level.
|
||||||
|
if level
|
||||||
logger = Log4r::Logger.new("vagrant")
|
logger = Log4r::Logger.new("vagrant")
|
||||||
logger.outputters = Log4r::Outputter.stdout
|
logger.outputters = Log4r::Outputter.stdout
|
||||||
logger.level = Log4r.const_get(ENV["VAGRANT_LOG"].upcase)
|
logger.level = level
|
||||||
logger = nil
|
logger = nil
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require 'pathname'
|
require 'pathname'
|
||||||
|
|
Loading…
Reference in New Issue