Merge branch 'log-level' into 'master'v3.6.0

Allow tuning the amount of log output that is generated.

See merge request gitlab-org/security-products/license-management!132

3 files changed, 3 insertions, 3 deletions

diff --git a/lib/license/management.rb b/lib/license/management.rb
index 930fa08..9a40d4b 100644
--- a/lib/license/management.rb
+++ b/lib/license/management.rb
@@ -24,7 +24,7 @@ module License
     end
 
     def self.logger
-      @logger ||= Logger.new(STDOUT)
+      @logger ||= Logger.new(STDOUT, level: ENV.fetch('LOG_LEVEL', Logger::WARN))
     end
   end
 end
diff --git a/lib/license/management/shell.rb b/lib/license/management/shell.rb
index 903d0b6..a1a1412 100644
--- a/lib/license/management/shell.rb
+++ b/lib/license/management/shell.rb
@@ -16,7 +16,7 @@ module License
         stdout, stderr, status = Open3.capture3(env, expanded_command)
 
         logger.debug(stdout) unless stdout.nil? || stdout.empty?
-        logger.error(stderr) unless stderr.nil? || stderr.empty?
+        logger.error(stderr) unless status.success?
         [stdout, stderr, status]
       end
 
diff --git a/lib/license/management/version.rb b/lib/license/management/version.rb
index 8440136..edcabbd 100644
--- a/lib/license/management/version.rb
+++ b/lib/license/management/version.rb
@@ -2,6 +2,6 @@
 
 module License
   module Management
-    VERSION = '3.5.0'
+    VERSION = '3.6.0'
   end
 end