ocean-rails 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c3ae94042c710802aa3e4ae565a82daad1d252a
-  data.tar.gz: c7f81b494efb7a75be1d89ddb83196e3db5f5318
+  metadata.gz: 67494c6924df9d8f1a2dd704500df6010a384595
+  data.tar.gz: 0dc5770477a5bf2c31262d58a27cd8baa9a7b607
 SHA512:
-  metadata.gz: e64edcb5dcd728fe6f5715d8e39d02c96bc31844fdd62819af1b614dec2e8caba7afc2072b7510d7a855430d89ffadb6860efa9c8384e331bfcc1e8ac0396994
-  data.tar.gz: 6caa66fdbac4ff464a0ec76b6c42327338577e6965fdc49a0c10775e9ba71d437b59475f8e4e93abe411b751639264a4522d9a91cf300f48b8b5ddf45a6a1f58
+  metadata.gz: b0517b03630de1a8e630c65bc1404e2ff9bb3cfd167e5cfd79b3f94686abaf01529c5b7d12ffb35002a10380c27ffb6bae82679e3005af55e149cbe2b75845da
+  data.tar.gz: 4e0f65e6727fca759254d0ce821b4e48a3a4690631afbf491f0f27fa5c9633f9e61a6365779569e9009c6124966f4b64aa393808decb833df4af93a1d0be4fc0

data/config/initializers/zeromq_logger.rb

@@ -25,12 +25,6 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
   remove_existing_log_subscriptions
 
 
-  ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
-    data = args.extract_options!
-    Thread.current[:filter] = data[:filter]
-  end
-
-
   INTERNAL_PARAMS = %w(controller action format _method only_path)
 
   ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, started, finished, unique_id, payload|
@@ -53,6 +47,7 @@ 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] = @x_api_token if @x_api_token
 
       Thread.current[:logdata] = data
       Thread.current[:filter] = nil
@@ -69,6 +64,12 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
   end
 
 
+  ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
+    data = args.extract_options!
+    Thread.current[:filter] = data[:filter]
+  end
+
+
   ActiveSupport::Notifications.subscribe 'request.action_dispatch' do |*args|
     x = args.extract_options!
     request = x[:request]

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-17 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday