Merge pull request #447 from cncf/hotfix/400_logger_env_var

allow underscore in logger level set env var name

Author: wvwatson

spec/utils/utils_spec.cr

@@ -267,13 +267,21 @@ describe "Utils" do
   it "'logger' command line logger level setting works", tags: ["logger", "happy-path"]  do
     # Note: implicitly tests the override of config.yml if it exist in repo root
     response_s = `./cnf-conformance -l debug test`
+    LOGGING.info response_s
+    $?.success?.should be_true
+    (/DEBUG -- cnf-conformance: debug test/ =~ response_s).should_not be_nil
+  end
+
+  it "'logger' LOGLEVEL NO underscore environment variable level setting works", tags: ["logger", "happy-path"]  do
+    # Note: implicitly tests the override of config.yml if it exist in repo root
+    response_s = `unset LOG_LEVEL; LOGLEVEL=DEBUG ./cnf-conformance test`
     $?.success?.should be_true
     (/DEBUG -- cnf-conformance: debug test/ =~ response_s).should_not be_nil
   end
 
-  it "'logger' environment variable level setting works", tags: ["logger", "happy-path"]  do
+  it "'logger' LOG_LEVEL WITH underscore environment variable level setting works", tags: ["logger", "happy-path"]  do
     # Note: implicitly tests the override of config.yml if it exist in repo root
-    response_s = `LOGLEVEL=DEBUG ./cnf-conformance test`
+    response_s = `LOG_LEVEL=DEBUG ./cnf-conformance test`
     $?.success?.should be_true
     (/DEBUG -- cnf-conformance: debug test/ =~ response_s).should_not be_nil
   end
@@ -289,7 +297,7 @@ describe "Utils" do
 
   it "'logger' defaults to error when level set is missplled", tags: ["logger"]  do
     # Note: implicitly tests the override of config.yml if it exist in repo root
-    response_s = `LOGLEVEL=DEGUB ./cnf-conformance test`
+    response_s = `unset LOG_LEVEL; LOGLEVEL=DEGUB ./cnf-conformance test`
     $?.success?.should be_true
     (/ERROR -- cnf-conformance: Invalid logging level set. defaulting to ERROR/ =~ response_s).should_not be_nil
   end

src/tasks/utils/utils.cr

@@ -58,8 +58,8 @@ end
 
 # this first line necessary to make sure our custom formatter
 # is used in the default error log line also
-  Log.setup(Log::Severity::Error, Log::IOBackend.new(formatter: log_formatter))
-  Log.setup(loglevel, Log::IOBackend.new(formatter: log_formatter))
+Log.setup(Log::Severity::Error, Log::IOBackend.new(formatter: log_formatter))
+Log.setup(loglevel, Log::IOBackend.new(formatter: log_formatter))
 
 
 def loglevel
@@ -84,6 +84,10 @@ def loglevel
     levelstr = ENV["LOGLEVEL"]
   end
 
+  if ENV.has_key?("LOG_LEVEL") 
+    levelstr = ENV["LOG_LEVEL"]
+  end
+
   # highest priority is last
   if !LogLevel.command_line_loglevel.empty?
     levelstr = LogLevel.command_line_loglevel