govuk_app_config 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4791663491d28ccdc275637220b357cf19f11c9b19f8b403521ac9549d7217
-  data.tar.gz: 6c387bd8d72e5e2f0da829840ea649532e977ae2db548a4085de95696b0c9bd2
+  metadata.gz: f6ccee36f212568567aae2e883811bbe90d13f3b8eba3a0a6ec568aa0f9310d6
+  data.tar.gz: 2ba7a9c3007655fd866b851262efd1c16bbd6f3398ef1dd6217f1e5cd86161c9
 SHA512:
-  metadata.gz: b9e384cbb4a039340d958dd1079108e5d4dbc5b32b500309e4ddf6aabf8a88f1694841e71e0d515de163c9482fd5ebde44c814272e3de5542b8b40a22031a4ba
-  data.tar.gz: 4716cf375f1a21591ca67c389b03cec93d13ca27701ac2f1f669011ebc03c2b756c10fe6ecedda56a25a09afef24493a3b3bab2957260f6889903125137f3ce1
+  metadata.gz: 103a2e57bb1a6bb546165ba5b37d607b23df991913b34b3683e46c52dcc8e4c8d383a7ac54f811fe9dbd7d8593d4e16e5ac39cbcb65ca74386c60d18dc05e57a
+  data.tar.gz: e48c9941ed14167896a6168bbc257578d8593be21245b8fd6cea552f96e84569e6e8b59715a269ef0b475be40b3776125f0b91954f7ff16cfa8f9b235f3e3042

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.13.0
+
+* Configure the GDS API Adapters logger to use logstasher
+* More consistent log level configuration by default
+
 # 1.12.0
 
 * Make ActiveRecord healthcheck more accurate

data/lib/govuk_app_config/govuk_logging.rb

@@ -20,7 +20,7 @@ module GovukLogging
     $stdout.reopen($stderr)
 
     # Send Rails' logs to STDERR because they're not JSON formatted.
-    Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new($stderr, level: Logger::INFO))
+    Rails.logger = ActiveSupport::TaggedLogging.new(Logger.new($stderr, level: Rails.logger.level))
 
     # Custom that will be added to the Rails request logs
     LogStasher.add_custom_fields do |fields|
@@ -46,7 +46,20 @@ module GovukLogging
     Rails.application.config.logstasher.view_enabled = false
     Rails.application.config.logstasher.job_enabled = false
 
-    Rails.application.config.logstasher.logger = Logger.new($real_stdout)
+    Rails.application.config.logstasher.logger = Logger.new(
+      $real_stdout,
+      level: Rails.logger.level
+    )
     Rails.application.config.logstasher.supress_app_log = true
+
+    if defined?(GdsApi::Base)
+      GdsApi::Base.default_options ||= {}
+
+      # The GDS API Adapters gem logs JSON to describe the requests it
+      # makes and the responses it gets, so direct this to the
+      # logstasher logger
+      GdsApi::Base.default_options[:logger] =
+        Rails.application.config.logstasher.logger
+    end
   end
 end

data/lib/govuk_app_config/version.rb

@@ -1,3 +1,3 @@
 module GovukAppConfig
-  VERSION = "1.12.0"
+  VERSION = "1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_app_config
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-xray-sdk