ocean-rails 2.2.1 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87e447d4f5093f7cafc67fd52f9fea8fe563f7c7
-  data.tar.gz: b9d938fcd817ca784af0bb7278239166dc5e73df
+  metadata.gz: 6a249ef526086a2b4e138e5e54d3b1e634671b20
+  data.tar.gz: 3f3dc81fca5f468771891cdd1364d8de15af68c4
 SHA512:
-  metadata.gz: 94c578ceaa77bae5eca755263d68434dbdf87c6b16ce57de1efac0e1a6c04b51b9b841fe3c15a69d10cdd8f512bbac65ad0da8f12b8b15210124ff52bc42d512
-  data.tar.gz: dc87dfae698a8bb3aaef8000c40cce655db9820a3114555f626de5e47a6ef40e555ab0eec9d7735b2446ee99159d76f2f58554ea6586c8d9defaacb6bd76b3bb
+  metadata.gz: d2a2e8ba731cae49376517c6bd6ac2d25ee0fc7e0a19fce4deaf923c93eb24b43badff2ebc0599b6573d5493aa85d6732305ef9a77618af3a7add1fa8edd474c
+  data.tar.gz: 99218c4cf33998ad2e6cb5212d1fc0bfdefea34555591803f17eb467829aee4d6daab435f013d71e9de49d0a9b4fb917c4a3dea60d6d69817ea31d347b9dd75c

data/config/initializers/zeromq_logger.rb

@@ -48,9 +48,14 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
       data[:params] = params if params.present?
       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?
 
       Thread.current[:logdata] = data
       Thread.current[:filter] = nil
+      Thread.current[:x_api_token] = nil
+      Thread.current[:username] = nil
+      Thread.current[:max_age] = nil
     end
   end
 

data/lib/ocean/ocean_application_controller.rb

@@ -66,6 +66,8 @@ module OceanApplicationController
     if response.status == 200
       @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.2.1"
+  VERSION = "2.3.1"
 end

data/lib/ocean/zeromq_logger.rb

@@ -1,3 +1,4 @@
+      data[:token] = Thread.current[:x_api_token] if Thread.current[:x_api_token].present?
 require 'socket'
 
 #
@@ -80,9 +81,11 @@ class ZeromqLogger
              service:   APP_NAME,
              level:     level
            }
-    data = data.merge msg if msg.is_a?(Hash)
+    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[:msg] = msg if msg.is_a?(String)
     data[:timestamp] = (Time.now.utc.to_f * 1000).to_i unless data[:timestamp]
+    data = data.merge msg if msg.is_a?(Hash)
     @logger.log data
     true
   end

metadata

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