ocean-rails 2.1.2 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1c3ae94042c710802aa3e4ae565a82daad1d252a
4
- data.tar.gz: c7f81b494efb7a75be1d89ddb83196e3db5f5318
3
+ metadata.gz: 67494c6924df9d8f1a2dd704500df6010a384595
4
+ data.tar.gz: 0dc5770477a5bf2c31262d58a27cd8baa9a7b607
5
5
  SHA512:
6
- metadata.gz: e64edcb5dcd728fe6f5715d8e39d02c96bc31844fdd62819af1b614dec2e8caba7afc2072b7510d7a855430d89ffadb6860efa9c8384e331bfcc1e8ac0396994
7
- data.tar.gz: 6caa66fdbac4ff464a0ec76b6c42327338577e6965fdc49a0c10775e9ba71d437b59475f8e4e93abe411b751639264a4522d9a91cf300f48b8b5ddf45a6a1f58
6
+ metadata.gz: b0517b03630de1a8e630c65bc1404e2ff9bb3cfd167e5cfd79b3f94686abaf01529c5b7d12ffb35002a10380c27ffb6bae82679e3005af55e149cbe2b75845da
7
+ data.tar.gz: 4e0f65e6727fca759254d0ce821b4e48a3a4690631afbf491f0f27fa5c9633f9e61a6365779569e9009c6124966f4b64aa393808decb833df4af93a1d0be4fc0
@@ -25,12 +25,6 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
25
25
  remove_existing_log_subscriptions
26
26
 
27
27
 
28
- ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
29
- data = args.extract_options!
30
- Thread.current[:filter] = data[:filter]
31
- end
32
-
33
-
34
28
  INTERNAL_PARAMS = %w(controller action format _method only_path)
35
29
 
36
30
  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?
53
47
  }
54
48
  data[:params] = params if params.present?
55
49
  data[:filter] = Thread.current[:filter] if Thread.current[:filter]
50
+ data[:token] = @x_api_token if @x_api_token
56
51
 
57
52
  Thread.current[:logdata] = data
58
53
  Thread.current[:filter] = nil
@@ -69,6 +64,12 @@ if Rails.env == 'production' && ENV['NO_ZEROMQ_LOGGING'].blank?
69
64
  end
70
65
 
71
66
 
67
+ ActiveSupport::Notifications.subscribe "halted_callback.action_controller" do |*args|
68
+ data = args.extract_options!
69
+ Thread.current[:filter] = data[:filter]
70
+ end
71
+
72
+
72
73
  ActiveSupport::Notifications.subscribe 'request.action_dispatch' do |*args|
73
74
  x = args.extract_options!
74
75
  request = x[:request]
data/lib/ocean/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Ocean
2
- VERSION = "2.1.2"
2
+ VERSION = "2.2.0"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ocean-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.2
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Peter Bengtson
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-02-17 00:00:00.000000000 Z
11
+ date: 2014-02-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: faraday