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

6 files changed, 10 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d99ae4..680ff65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # GitLab License management changelog
 
+## v3.6.0
+
+- Change default log level to `warn`. (!132)
+- Allow control of the log level via the `LOG_LEVEL` environment variable. (!132)
+
 ## v3.5.0
 
 - Improve license detection in go modules projects. (!129)
diff --git a/Gemfile.lock b/Gemfile.lock
index 6f28618..8b10c64 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    license-management (3.5.0)
+    license-management (3.6.0)
       license_finder (~> 6.0.0)
       spandx (~> 0.1)
 
diff --git a/README.md b/README.md
index 11e62ec..c1820a5 100644
--- a/README.md
+++ b/README.md
@@ -112,6 +112,7 @@ The License Management tool can be customized with environments variables for so
 | LICENSE_FINDER_CLI_OPTS | * | Additional arguments for the `license_finder` executable. |
 | LM_JAVA_VERSION      | Java (Maven) | Version of Java. If set to `11`, Maven and Gradle use Java 11 instead of Java 8. |
 | LM_PYTHON_VERSION    | Python       | Version of Python. If set to `3`, dependencies are installed using Python 3 instead of Python 2.7. |
+| LOG_LEVEL    | * | Control the verbosity of the logs. (`debug`, `info`, `warn` (default), `error`, `fatal`)  |
 
 
 Inject the required environment variables to the docker command using the [`--env` option flag](https://docs.docker.com/engine/reference/commandline/run/#set-environment-variables--e---env---env-file)
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