ocean-rails 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b13718e43658a8cbbab59eeea8772fb33e4af6a5
-  data.tar.gz: 93e4ad6542d92d6b618418a619d7500d96aa7849
+  metadata.gz: 6c8fc6e246cde2aa68bc5dce289c38594179e3bc
+  data.tar.gz: 11b887939c230f3d018bd4d20a9b4d6bdd6c1951
 SHA512:
-  metadata.gz: 1c7b16ef3c629ae4f19a59bb62078b31eaf356a8ff2c0d9ad73969aa9544f349e466802230e30a2eade8cce98b6492d65189ff5db800eaf8dfeac3e9403d88e1
-  data.tar.gz: 550c1ce9f07e06a834ecac0ebe3f97b5799e93b660e0488e20e798f84ab44a95bfc2546ef74696f32900c66130fd836ce7246fde9b7919624f0091f2d3f598b8
+  metadata.gz: 7a8b28df7106d2271eb53fdf0a8cda8db530715c9b79052d238ca0b0a6c601c2fd532b71135bc2b996da72f241ed3fc403903bcdf919dcbd3a3704af440d8bfd
+  data.tar.gz: 00fa21db7eee1c99e25352ad8143709c80f551fafa5c23ca023aa7bb36ac919b52f2043ce247a61eae4ea7babed7325972e4b1019272808feb6c3efae3bef301

data/config/initializers/zeromq_logger.rb

@@ -49,14 +49,11 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
       data[:filter] = Thread.current[:filter] if Thread.current[:filter]
       data[:token] = Thread.current[:x_api_token] if Thread.current[:x_api_token].present?
       data[:username] = Thread.current[:username] if Thread.current[:username].present?
-      data[:max_age] = Thread.current[:max_age] if Thread.current[:max_age].present?
-      data[:cache_control] = payload[:response].headers['Cache-Control'] if payload[:response].headers['Cache-Control']
 
       Thread.current[:logdata] = data
       Thread.current[:filter] = nil
       Thread.current[:x_api_token] = nil
       Thread.current[:username] = nil
-      Thread.current[:max_age] = nil
       Thread.current[:cache_control] = nil
     end
   end
@@ -93,6 +90,10 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
       data[:_api_error] = JSON.parse(body)['_api_error']
     end
 
+    if response
+      data[:cache_control] = response.headers['Cache-Control']
+    end
+
     ex = request.env["action_dispatch.exception"]
     if ex 
       if data[:status] == 404

data/lib/ocean/ocean_application_controller.rb

@@ -67,7 +67,6 @@ module OceanApplicationController
       @auth_api_user_id = response.body['authentication']['user_id']  # Deprecate and remove
       @auth_api_user_uri = response.body['authentication']['_links']['creator']['href']  # Keep
       Thread.current[:username] = response.body['authentication']['username']
-      Thread.current[:max_age] = response.body['authentication']['max_age']
       return true
     end
     error_messages = response.body['_api_error']

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.3.2"
+  VERSION = "2.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Peter Bengtson