feat: allow --log-level to be specified in the CLI

Closes: #91

Author: bethesque

lib/pact/mock_service/cli.rb

@@ -22,6 +22,7 @@ class CLI < Thor
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact. Note that only versions 1 and 2 are currently supported.", default: '2'
       method_option :log, aliases: "-l", desc: "File to which to log output"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
       method_option :sslcert, desc: "Specify the path to the SSL cert to use when running the service over HTTPS"
@@ -38,6 +39,7 @@ def service
       method_option :host, aliases: "-h", desc: "Host on which to bind the service", default: 'localhost'
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written"
       method_option :log_dir, aliases: "-l", desc: "File to which to log output"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact. Note that only versions 1 and 2 are currently supported.", default: '2'
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
@@ -59,6 +61,7 @@ def control
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
       method_option :log, aliases: "-l", desc: "File to which to log output"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact. Note that only versions 1 and 2 are currently supported.", default: '2'
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
@@ -89,6 +92,7 @@ def stop
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pid_dir, desc: "PID dir", default: 'tmp/pids'
       method_option :log, aliases: "-l", desc: "File to which to log output"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact. Note that only versions 1 and 2 are currently supported.", default: '2'
       method_option :cors, aliases: "-o", desc: "Support browser security in tests by responding to OPTIONS requests and adding CORS headers to mocked responses"
       method_option :ssl, desc: "Use a self-signed SSL cert to run the service over HTTPS", type: :boolean, default: false
@@ -104,6 +108,7 @@ def restart
       desc 'control-start', "Start a Pact mock service control server."
       method_option :port, aliases: "-p", desc: "Port on which to run the service", default: '1234'
       method_option :log_dir, aliases: "-l", desc: "File to which to log output", default: "log"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact", default: '2'
       method_option :pid_dir, desc: "PID dir", default: "tmp/pids"
@@ -130,6 +135,7 @@ def control_stop
       desc 'control-restart', "Start a Pact mock service control server."
       method_option :port, aliases: "-p", desc: "Port on which to run the service", default: '1234'
       method_option :log_dir, aliases: "-l", desc: "File to which to log output", default: "log"
+      method_option :log_level, desc: "Log level. Options are DEBUG INFO WARN ERROR", default: "DEBUG"
       method_option :pact_dir, aliases: "-d", desc: "Directory to which the pacts will be written", default: "."
       method_option :pact_file_write_mode, aliases: "-m", desc: PACT_FILE_WRITE_MODE_DESC, type: :string, default: 'overwrite'
       method_option :pact_specification_version, aliases: "-i", desc: "The pact specification version to use when writing the pact. Note that only versions 1 and 2 are currently supported.", default: '2'

lib/pact/mock_service/logger.rb

@@ -19,9 +19,22 @@ def self.from_options options
         log_stream = options[:log_file] || $stdout
         logger = new log_stream
         logger.formatter = options[:log_formatter] if options[:log_formatter]
-        logger.level = ::Logger::DEBUG
+        logger.level = logger_level(options[:log_level])
         logger
       end
+
+      def self.logger_level log_level_string
+        if log_level_string
+          begin
+            Kernel.const_get('Logger').const_get(log_level_string.upcase)
+          rescue NameError
+            $stderr.puts "WARN: Ignoring log level '#{log_level_string}' as it is not a valid value. Valid values are: DEBUG INFO WARN ERROR FATAL. Using DEBUG."
+            Logger::DEBUG
+          end
+        else
+          Logger::DEBUG
+        end
+      end
     end
   end
 end

lib/pact/mock_service/run.rb

@@ -52,6 +52,7 @@ def call_shutdown_hooks
       def service_options
         service_options = {
           pact_dir: options[:pact_dir],
+          log_level: options[:log_level],
           unique_pact_file_names: options[:unique_pact_file_names],
           consumer: options[:consumer],
           provider: options[:provider],

lib/pact/mock_service/spawn.rb

@@ -37,6 +37,7 @@ def build_app
       def mock_service
         Pact::MockService.new(
           log_file: create_log_file,
+          log_level: options[:log_level],
           name: name,
           consumer: consumer,
           provider: provider,

script/example.sh

@@ -2,13 +2,14 @@
 
 # BEFORE SUITE start mock service
 # invoked by the pact framework
-bundle exec pact-mock-service service \
+bundle exec bin/pact-mock-service service \
   --port 1234 \
   --consumer Foo \
   --provider Bar \
   --pact-specification-version 2 \
   --pact-dir ./tmp/pacts \
-  --log ./tmp/bar_mock_service.log &
+  --log ./tmp/bar_mock_service.log \
+  --log-level DEBUG &
 pid=$!
 
 # BEFORE SUITE wait for mock service to start up