feat: allow log level to be configured via PACT_BROKER_LOG_LEVEL

README.md

@@ -40,6 +40,10 @@ For an sqlite database (only recommended for investigation/spikes, as it will be
 ## Using basic auth
 Run your container with `PACT_BROKER_BASIC_AUTH_USERNAME` and `PACT_BROKER_BASIC_AUTH_PASSWORD` set to enable basic auth for the pact broker application. Note that the [verification status badges][badges] are not protected by basic auth, so that you may embed them in README markdown.
 
+## Setting the log level
+
+Set the environment variable `PACT_BROKER_LOG_LEVEL` to one of `DEBUG`, `INFO`, `WARN`, `ERROR`, or `FATAL`.
+
 ## Running with Docker Compose
 
 For a quick start with the Pact Broker and Postgres, we have an example
@@ -58,4 +62,9 @@ curl -v http://$DOCKER_HOST # you can visit in your browser too!
 
 _NOTE: this image should be modified before using in Production, in particular, the use of hard-coded credentials_
 
+# Troubleshooting
+
+See the [Troubleshooting][troubleshooting] page on the wiki.
+
 [badges]: https://github.com/pact-foundation/pact_broker/wiki/Provider-verification-badges
+[troubleshooting]: https://github.com/DiUS/pact_broker-docker/wiki/Troubleshooting

container/etc/nginx/main.d/pactbroker-env.conf

@@ -6,3 +6,4 @@ env PACT_BROKER_DATABASE_NAME;
 env PACT_BROKER_DATABASE_PORT;
 env PACT_BROKER_BASIC_AUTH_USERNAME;
 env PACT_BROKER_BASIC_AUTH_PASSWORD;
+env PACT_BROKER_LOG_LEVEL;

pact_broker/config.ru

@@ -1,13 +1,12 @@
-require 'logger'
 require 'sequel'
 require 'pact_broker'
+require_relative 'logger'
 require_relative 'basic_auth'
 require_relative 'database_connection'
 require_relative 'passenger_config'
 
 app = PactBroker::App.new do | config |
-  config.logger = ::Logger.new($stdout)
-  config.logger.level = Logger::WARN
+  config.logger = $logger
   config.database_connection = create_database_connection(config.logger)
   config.database_connection.timezone = :utc
 end

pact_broker/logger.rb

@@ -0,0 +1,11 @@
+require 'logger'
+
+log_level = begin
+  Kernel.const_get('Logger').const_get(ENV['PACT_BROKER_LOG_LEVEL'] || 'WARN')
+rescue NameError
+  $stderr.puts "Ignoring PACT_BROKER_LOG_LEVEL '#{ENV['PACT_BROKER_LOG_LEVEL']}' as it is invalid. Valid values are: DEBUG INFO WARN ERROR FATAL. Using WARN."
+  Logger::WARN
+end
+
+$logger = ::Logger.new($stdout)
+$logger.level = log_level

script/test.sh

@@ -159,6 +159,7 @@ docker run --privileged --name=${PACT_CONT_NAME} -d -p ${PORT_BIND} \
   -e PACT_BROKER_DATABASE_PORT=${PACT_BROKER_DATABASE_PORT} \
   -e PACT_BROKER_BASIC_AUTH_USERNAME=${PACT_BROKER_BASIC_AUTH_USERNAME} \
   -e PACT_BROKER_BASIC_AUTH_PASSWORD=${PACT_BROKER_BASIC_AUTH_PASSWORD} \
+  -e PACT_BROKER_LOG_LEVEL=INFO \
   dius/pact_broker
 sleep 1 && docker logs ${PACT_CONT_NAME}