rabbit_messaging 0.7.0 → 0.11.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/test.yml +55 -0
- data/.rubocop.yml +5 -1
- data/CHANGELOG.md +42 -0
- data/README.md +41 -1
- data/lib/rabbit.rb +7 -0
- data/lib/rabbit/daemon.rb +5 -3
- data/lib/rabbit/event_handler.rb +7 -4
- data/lib/rabbit/publishing.rb +18 -37
- data/lib/rabbit/publishing/channels_pool.rb +74 -0
- data/lib/rabbit/publishing/message.rb +7 -7
- data/lib/rabbit/receiving/job.rb +7 -8
- data/lib/rabbit/receiving/message.rb +13 -6
- data/lib/rabbit/receiving/queue.rb +39 -0
- data/lib/rabbit/receiving/receive.rb +66 -0
- data/lib/rabbit/receiving/worker.rb +21 -43
- data/lib/rabbit/version.rb +1 -1
- data/rabbit_messaging.gemspec +4 -4
- metadata +22 -19
- data/.travis.yml +0 -19
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: b8542a34d9178bfbaa0b060bedeabcd4811473def27cae7a52bafb34d6706939
|
4
|
+
data.tar.gz: da404d62299855fbdd94c037487e3ccd177818d1d684ce5db74ebad17dfad1dd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 06b75c450a69a43b4926b5fa4c1581a3bcb3d728ce826050d4ea4e002dbb38f5729d3c3203d9c4fc916d843e2bd8cf0f1c14fc6b58ac670b0a58a821408f9c9f
|
7
|
+
data.tar.gz: 34ac8124872567403c219a98d682644c80f43f2be201d085b9c7c58258b852a4624b67b64a78ad0b1eb99069734efa3af602db0c0ae566a3175fefb56b774a28
|
@@ -0,0 +1,55 @@
|
|
1
|
+
name: Test
|
2
|
+
|
3
|
+
on: [push, pull_request]
|
4
|
+
|
5
|
+
jobs:
|
6
|
+
full-check:
|
7
|
+
runs-on: ubuntu-latest
|
8
|
+
|
9
|
+
# We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
|
10
|
+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/rabbit_messaging'
|
11
|
+
|
12
|
+
steps:
|
13
|
+
- uses: actions/checkout@v2
|
14
|
+
- uses: ruby/setup-ruby@v1
|
15
|
+
with:
|
16
|
+
ruby-version: 3.0
|
17
|
+
bundler-cache: true
|
18
|
+
- name: Create log dir
|
19
|
+
run: mkdir -p log
|
20
|
+
- name: Run Linter
|
21
|
+
run: bundle exec rubocop
|
22
|
+
- name: Run audit
|
23
|
+
run: bundle exec rake bundle:audit
|
24
|
+
- name: Run specs
|
25
|
+
run: bundle exec rspec
|
26
|
+
- name: Coveralls
|
27
|
+
uses: coverallsapp/github-action@master
|
28
|
+
with:
|
29
|
+
github-token: ${{ secrets.GITHUB_TOKEN }}
|
30
|
+
specs:
|
31
|
+
runs-on: ubuntu-latest
|
32
|
+
continue-on-error: ${{ matrix.experimental }}
|
33
|
+
|
34
|
+
# We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
|
35
|
+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/rabbit_messaging'
|
36
|
+
|
37
|
+
strategy:
|
38
|
+
fail-fast: false
|
39
|
+
matrix:
|
40
|
+
ruby: [2.5, 2.6, 2.7]
|
41
|
+
experimental: [false]
|
42
|
+
include:
|
43
|
+
- ruby: head
|
44
|
+
experimental: true
|
45
|
+
|
46
|
+
steps:
|
47
|
+
- uses: actions/checkout@v2
|
48
|
+
- uses: ruby/setup-ruby@v1
|
49
|
+
with:
|
50
|
+
ruby-version: ${{ matrix.ruby }}
|
51
|
+
bundler-cache: true
|
52
|
+
- name: Create log dir
|
53
|
+
run: mkdir -p log
|
54
|
+
- name: Run specs
|
55
|
+
run: bundle exec rspec
|
data/.rubocop.yml
CHANGED
@@ -3,7 +3,7 @@ inherit_gem:
|
|
3
3
|
|
4
4
|
AllCops:
|
5
5
|
DisplayCopNames: true
|
6
|
-
TargetRubyVersion: 2.
|
6
|
+
TargetRubyVersion: 2.5
|
7
7
|
Include:
|
8
8
|
- lib/**/*.rb
|
9
9
|
- spec/**/*.rb
|
@@ -15,3 +15,7 @@ AllCops:
|
|
15
15
|
|
16
16
|
Style/Alias:
|
17
17
|
EnforcedStyle: prefer_alias_method
|
18
|
+
|
19
|
+
Style/HashConversion:
|
20
|
+
Exclude:
|
21
|
+
- spec/**/*
|
data/CHANGELOG.md
CHANGED
@@ -1,6 +1,48 @@
|
|
1
1
|
# Changelog
|
2
2
|
All notable changes to this project will be documented in this file.
|
3
3
|
|
4
|
+
## [0.11.0] - 2021-05-05
|
5
|
+
### Added
|
6
|
+
- `Rabbit.config.receiving_job_class_callable` now receives the full message context (with `message`, `delivery_info` and `arguments` (see the `Rabbit::Receiving::Receive`));
|
7
|
+
|
8
|
+
## [0.10.0] - 2021-03-05
|
9
|
+
### Added
|
10
|
+
- logging message headers
|
11
|
+
|
12
|
+
## [0.9.0] - 2020-11-18
|
13
|
+
### Added
|
14
|
+
- configurable publish skipping (previous iteration just skipped in development)
|
15
|
+
|
16
|
+
### Fixed
|
17
|
+
- fix for receiving (delivery_info and args to hashes)
|
18
|
+
- fix for requiring receiving job
|
19
|
+
|
20
|
+
## [0.8.1] - 2020-11-05
|
21
|
+
### Added
|
22
|
+
- channels pool for manage channels on Publisher connection
|
23
|
+
### Changed
|
24
|
+
- Publisher use channels pool for access to channel
|
25
|
+
|
26
|
+
## [0.8.0] - 2020-10-28
|
27
|
+
### Added
|
28
|
+
- class Rabbit::Recieving::Receive for message processing
|
29
|
+
- class Rabbit::Recieving::Queue for queue name determination when receiving
|
30
|
+
- message_id argument in published and received messages
|
31
|
+
- before and after hooks when processing message
|
32
|
+
- specs for new functionality
|
33
|
+
- arguments attribute in received message and handler (contain raw message arguments with exchange and routing_key from the delivery_info)
|
34
|
+
|
35
|
+
### Changed
|
36
|
+
- Rabbit::Receiving::Worker refactoring (message processing moved to a separate class)
|
37
|
+
- ruby version upped to 2.5
|
38
|
+
- rubocop ruby target version set to 2.5
|
39
|
+
- some fixes of updated rubocop and ruby warnings
|
40
|
+
- heavy refactoring of old specs for receiving
|
41
|
+
|
42
|
+
## [0.7.1] - 2020-06-09
|
43
|
+
### Changed
|
44
|
+
- (Partially Fixed) Support for pre-defined logger injection on Sneakers moudle;
|
45
|
+
|
4
46
|
## [0.7.0] - 2020-06-09
|
5
47
|
### Added
|
6
48
|
- Support for multiple customizable loggers;
|
data/README.md
CHANGED
@@ -58,9 +58,32 @@ require "rabbit_messaging"
|
|
58
58
|
* `:development` environment auto-creates queues and uses default exchange
|
59
59
|
* `:production` environment enables handlers caching and gets maximum strictness
|
60
60
|
|
61
|
+
By default gem skips publishing in test and development environments.
|
62
|
+
If you want to change that then manually set `Rabbit.skip_publishing_in` with an array of environments.
|
63
|
+
|
64
|
+
```ruby
|
65
|
+
Rabbit.skip_publishing_in = %i[test]
|
66
|
+
```
|
67
|
+
|
61
68
|
* `receiving_job_class_callable` (`Proc`)
|
62
69
|
|
63
|
-
Custom ActiveJob subclass to work with received messages.
|
70
|
+
Custom ActiveJob subclass to work with received messages. Receives the following attributes as `kwarg`-arguments:
|
71
|
+
|
72
|
+
* `:arguments` - information about message type (`type`), application id (`app_id`), message id (`message_id`);
|
73
|
+
* `:delivery_info` - information about `exchange`, `routing_key`, etc;
|
74
|
+
* `:message` - received RabbitMQ message (often in a `string` format);
|
75
|
+
|
76
|
+
```ruby
|
77
|
+
{
|
78
|
+
message: '{"hello":"world","foo":"bar"}',
|
79
|
+
delivery_info: { exchange: "some exchange", routing_key: "some_key" },
|
80
|
+
arguments: {
|
81
|
+
type: "some_successful_event",
|
82
|
+
app_id: "some_group.some_app",
|
83
|
+
message_id: "uuid",
|
84
|
+
}
|
85
|
+
}
|
86
|
+
```
|
64
87
|
|
65
88
|
* `exception_notifier` (`Proc`)
|
66
89
|
|
@@ -71,6 +94,22 @@ require "rabbit_messaging"
|
|
71
94
|
config.exception_notifier = proc { |e| MyCoolNotifier.notify!(e) }
|
72
95
|
```
|
73
96
|
|
97
|
+
* `before_receiving_hooks, after_receiving_hooks` (`Array of Procs`)
|
98
|
+
|
99
|
+
Before and after hooks with message processing in the middle. Where `before_receiving_hooks` and `after_receiving_hooks` are empty arrays by default.
|
100
|
+
|
101
|
+
It's advised to NOT place procs with long execution time inside.
|
102
|
+
|
103
|
+
Setup:
|
104
|
+
|
105
|
+
```ruby
|
106
|
+
config.before_receiving_hooks.append(proc { |message, arguments| do_stuff_1 })
|
107
|
+
config.before_receiving_hooks.append(proc { |message, arguments| do_stuff_2 })
|
108
|
+
|
109
|
+
config.after_receiving_hooks.append(proc { |message, arguments| do_stuff_3 })
|
110
|
+
config.after_receiving_hooks.append(proc { |message, arguments| do_stuff_4 })
|
111
|
+
|
112
|
+
```
|
74
113
|
---
|
75
114
|
|
76
115
|
### Client
|
@@ -83,6 +122,7 @@ Rabbit.publish(
|
|
83
122
|
exchange_name: 'fanout', # default is fine too
|
84
123
|
confirm_select: true, # setting this to false grants you great speed up and absolutelly no guarantees
|
85
124
|
headers: { "foo" => "bar" }, # custom arguments for routing, default is {}
|
125
|
+
message_id: "asdadsadsad", # A unique identifier such as a UUID that your application can use to identify the message.
|
86
126
|
)
|
87
127
|
```
|
88
128
|
|
data/lib/rabbit.rb
CHANGED
@@ -23,6 +23,9 @@ module Rabbit
|
|
23
23
|
attribute :queue_name_conversion
|
24
24
|
attribute :receiving_job_class_callable
|
25
25
|
attribute :exception_notifier, default: -> { default_exception_notifier }
|
26
|
+
attribute :before_receiving_hooks, default: []
|
27
|
+
attribute :after_receiving_hooks, default: []
|
28
|
+
attribute :skip_publishing_in, default: %i[test development]
|
26
29
|
|
27
30
|
attribute :receive_logger, default: lambda {
|
28
31
|
Logger.new(Rails.root.join("log", "incoming_rabbit_messages.log"))
|
@@ -45,6 +48,10 @@ module Rabbit
|
|
45
48
|
end
|
46
49
|
end
|
47
50
|
|
51
|
+
def skip_publish?
|
52
|
+
skip_publishing_in.include?(environment)
|
53
|
+
end
|
54
|
+
|
48
55
|
def app_name
|
49
56
|
[group_id, project_id].join(".")
|
50
57
|
end
|
data/lib/rabbit/daemon.rb
CHANGED
@@ -24,9 +24,11 @@ module Rabbit
|
|
24
24
|
**config,
|
25
25
|
)
|
26
26
|
|
27
|
-
Sneakers.logger
|
28
|
-
|
29
|
-
|
27
|
+
unless Sneakers.logger
|
28
|
+
Sneakers.logger = Logger.new(Rails.root.join("log", "sneakers.log"))
|
29
|
+
Sneakers.logger.level = Logger::DEBUG
|
30
|
+
Lamian.extend_logger(Sneakers.logger)
|
31
|
+
end
|
30
32
|
|
31
33
|
Sneakers.server = true
|
32
34
|
|
data/lib/rabbit/event_handler.rb
CHANGED
@@ -7,7 +7,9 @@ class Rabbit::EventHandler
|
|
7
7
|
include Tainbox
|
8
8
|
|
9
9
|
attribute :project_id
|
10
|
-
|
10
|
+
attribute :data
|
11
|
+
attribute :message_info
|
12
|
+
|
11
13
|
class_attribute :queue
|
12
14
|
class_attribute :ignore_queue_conversion, default: false
|
13
15
|
|
@@ -20,8 +22,9 @@ class Rabbit::EventHandler
|
|
20
22
|
end
|
21
23
|
|
22
24
|
def initialize(message)
|
23
|
-
self.attributes
|
24
|
-
self.data
|
25
|
-
self.project_id
|
25
|
+
self.attributes = message.data
|
26
|
+
self.data = message.data
|
27
|
+
self.project_id = message.project_id
|
28
|
+
self.message_info = message.arguments
|
26
29
|
end
|
27
30
|
end
|
data/lib/rabbit/publishing.rb
CHANGED
@@ -5,39 +5,32 @@ require "rabbit/publishing/message"
|
|
5
5
|
module Rabbit
|
6
6
|
module Publishing
|
7
7
|
autoload :Job, "rabbit/publishing/job"
|
8
|
+
autoload :ChannelsPool, "rabbit/publishing/channels_pool"
|
9
|
+
extend self
|
8
10
|
|
9
11
|
MUTEX = Mutex.new
|
10
12
|
|
11
|
-
|
13
|
+
def publish(msg)
|
14
|
+
return if Rabbit.config.skip_publish?
|
12
15
|
|
13
|
-
|
14
|
-
|
16
|
+
pool.with_channel msg.confirm_select? do |ch|
|
17
|
+
ch.basic_publish *msg.basic_publish_args
|
15
18
|
|
16
|
-
|
17
|
-
|
19
|
+
raise MessageNotDelivered, "RabbitMQ message not delivered: #{msg}" \
|
20
|
+
if msg.confirm_select? && !ch.wait_for_confirms
|
18
21
|
|
19
|
-
|
20
|
-
raise MessageNotDelivered, "RabbitMQ message not delivered: #{message}"
|
21
|
-
else
|
22
|
-
log(message)
|
22
|
+
log msg
|
23
23
|
end
|
24
24
|
rescue Timeout::Error
|
25
25
|
raise MessageNotDelivered, <<~MESSAGE
|
26
|
-
Timeout while sending message #{
|
27
|
-
- #{
|
26
|
+
Timeout while sending message #{msg}. Possible reasons:
|
27
|
+
- #{msg.real_exchange_name} exchange is not found
|
28
28
|
- RabbitMQ is extremely high loaded
|
29
29
|
MESSAGE
|
30
30
|
end
|
31
31
|
|
32
|
-
def
|
33
|
-
MUTEX.synchronize { @
|
34
|
-
end
|
35
|
-
|
36
|
-
def channel(confirm)
|
37
|
-
Thread.current[:bunny_channels] ||= {}
|
38
|
-
channel = Thread.current[:bunny_channels][confirm]
|
39
|
-
Thread.current[:bunny_channels][confirm] = create_channel(confirm) unless channel&.open?
|
40
|
-
Thread.current[:bunny_channels][confirm]
|
32
|
+
def pool
|
33
|
+
MUTEX.synchronize { @pool ||= ChannelsPool.new(create_client) }
|
41
34
|
end
|
42
35
|
|
43
36
|
private
|
@@ -47,33 +40,21 @@ module Rabbit
|
|
47
40
|
end
|
48
41
|
|
49
42
|
def create_client
|
50
|
-
return if Rabbit.config.environment == :test
|
51
|
-
|
52
43
|
config = Rails.application.config_for("sneakers") rescue {}
|
53
44
|
config = config["bunny_options"].to_h.symbolize_keys
|
54
45
|
|
55
|
-
|
56
|
-
Bunny.new(config).start
|
57
|
-
rescue
|
58
|
-
raise unless Rabbit.config.environment == :development
|
59
|
-
end
|
60
|
-
end
|
61
|
-
|
62
|
-
def create_channel(confirm)
|
63
|
-
channel = client.create_channel
|
64
|
-
channel.confirm_select if confirm
|
65
|
-
channel
|
46
|
+
Bunny.new(config).start
|
66
47
|
end
|
67
48
|
|
68
49
|
def log(message)
|
69
50
|
@logger ||= Rabbit.config.publish_logger
|
70
51
|
|
71
|
-
|
72
|
-
message.real_exchange_name, message.routing_key, message.
|
73
|
-
message.confirm_select? ? "confirm" : "no-confirm"
|
52
|
+
metadata = [
|
53
|
+
message.real_exchange_name, message.routing_key, message.headers,
|
54
|
+
message.event, message.confirm_select? ? "confirm" : "no-confirm"
|
74
55
|
]
|
75
56
|
|
76
|
-
@logger.debug "#{
|
57
|
+
@logger.debug "#{metadata.join ' / '}: #{message.data}"
|
77
58
|
end
|
78
59
|
end
|
79
60
|
end
|
@@ -0,0 +1,74 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module Rabbit
|
4
|
+
module Publishing
|
5
|
+
class ChannelsPool
|
6
|
+
class BaseQueue < Queue
|
7
|
+
def initialize(session, max_size)
|
8
|
+
super()
|
9
|
+
|
10
|
+
@session = session
|
11
|
+
@max_size = max_size - 1
|
12
|
+
@ch_size = 0
|
13
|
+
@create_mon = Mutex.new
|
14
|
+
@ch_dec_mon = Mutex.new
|
15
|
+
end
|
16
|
+
|
17
|
+
def pop
|
18
|
+
add_channel if size.zero?
|
19
|
+
|
20
|
+
super
|
21
|
+
end
|
22
|
+
alias_method :deq, :pop
|
23
|
+
|
24
|
+
def push(channel)
|
25
|
+
return @ch_dec_mon.synchronize { @ch_size -= 1 } unless channel&.open?
|
26
|
+
|
27
|
+
super
|
28
|
+
end
|
29
|
+
alias_method :enq, :push
|
30
|
+
|
31
|
+
def add_channel
|
32
|
+
@create_mon.synchronize do
|
33
|
+
return unless @ch_size < @max_size
|
34
|
+
|
35
|
+
push create_channel
|
36
|
+
@ch_size += 1
|
37
|
+
end
|
38
|
+
end
|
39
|
+
|
40
|
+
protected
|
41
|
+
|
42
|
+
def create_channel
|
43
|
+
@session.create_channel
|
44
|
+
end
|
45
|
+
end
|
46
|
+
|
47
|
+
class ConfirmQueue < BaseQueue
|
48
|
+
def create_channel
|
49
|
+
ch = @session.create_channel
|
50
|
+
ch.confirm_select
|
51
|
+
|
52
|
+
ch
|
53
|
+
end
|
54
|
+
end
|
55
|
+
|
56
|
+
def initialize(session)
|
57
|
+
max_size = session.channel_max
|
58
|
+
|
59
|
+
@pools = {
|
60
|
+
true => ConfirmQueue.new(session, max_size / 2),
|
61
|
+
false => BaseQueue.new(session, max_size / 2),
|
62
|
+
}.freeze
|
63
|
+
end
|
64
|
+
|
65
|
+
def with_channel(confirm)
|
66
|
+
pool = @pools[confirm]
|
67
|
+
ch = pool.deq
|
68
|
+
yield ch
|
69
|
+
ensure
|
70
|
+
pool.enq ch
|
71
|
+
end
|
72
|
+
end
|
73
|
+
end
|
74
|
+
end
|
@@ -6,13 +6,14 @@ module Rabbit::Publishing
|
|
6
6
|
class Message
|
7
7
|
include Tainbox
|
8
8
|
|
9
|
-
attribute :routing_key,
|
10
|
-
attribute :event,
|
11
|
-
attribute :data,
|
12
|
-
attribute :exchange_name,
|
9
|
+
attribute :routing_key, String
|
10
|
+
attribute :event, String
|
11
|
+
attribute :data, default: {}
|
12
|
+
attribute :exchange_name, default: []
|
13
13
|
attribute :confirm_select, default: true
|
14
|
-
attribute :realtime,
|
14
|
+
attribute :realtime, default: false
|
15
15
|
attribute :headers
|
16
|
+
attribute :message_id
|
16
17
|
|
17
18
|
alias_method :confirm_select?, :confirm_select
|
18
19
|
alias_method :realtime?, :realtime
|
@@ -41,6 +42,7 @@ module Rabbit::Publishing
|
|
41
42
|
content_type: "application/json",
|
42
43
|
app_id: Rabbit.config.app_name,
|
43
44
|
headers: headers,
|
45
|
+
message_id: message_id,
|
44
46
|
}
|
45
47
|
|
46
48
|
[JSON.dump(data), real_exchange_name, routing_key.to_s, options]
|
@@ -54,8 +56,6 @@ module Rabbit::Publishing
|
|
54
56
|
[Rabbit.config.group_id, Rabbit.config.project_id, *exchange_name].join(".")
|
55
57
|
end
|
56
58
|
|
57
|
-
private
|
58
|
-
|
59
59
|
def headers
|
60
60
|
super || {}
|
61
61
|
end
|
data/lib/rabbit/receiving/job.rb
CHANGED
@@ -1,6 +1,7 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
require "lamian"
|
4
|
+
require "active_job"
|
4
5
|
|
5
6
|
require "rabbit"
|
6
7
|
require "rabbit/receiving"
|
@@ -11,14 +12,12 @@ require "rabbit/receiving/malformed_message"
|
|
11
12
|
class Rabbit::Receiving::Job < ActiveJob::Base
|
12
13
|
def perform(message, arguments)
|
13
14
|
Lamian.run do
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
Rabbit.config.exception_notifier.call(error)
|
21
|
-
end
|
15
|
+
message = Rabbit::Receiving::Message.build(message, arguments)
|
16
|
+
handler = Rabbit::Receiving::HandlerResolver.handler_for(message)
|
17
|
+
handler.new(message).call
|
18
|
+
rescue Rabbit::Receiving::MalformedMessage => error
|
19
|
+
raise if Rabbit.config.environment == :test
|
20
|
+
Rabbit.config.exception_notifier.call(error)
|
22
21
|
end
|
23
22
|
end
|
24
23
|
end
|
@@ -10,16 +10,23 @@ module Rabbit::Receiving
|
|
10
10
|
|
11
11
|
attribute :group_id
|
12
12
|
attribute :project_id
|
13
|
+
attribute :message_id
|
13
14
|
attribute :event
|
14
15
|
attribute :data
|
16
|
+
attribute :arguments
|
15
17
|
attribute :original_message
|
16
18
|
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
19
|
+
def self.build(message, arguments)
|
20
|
+
group_id, project_id = arguments.fetch(:app_id).split(".")
|
21
|
+
|
22
|
+
new(
|
23
|
+
group_id: group_id,
|
24
|
+
project_id: project_id,
|
25
|
+
event: arguments.fetch(:type),
|
26
|
+
data: message,
|
27
|
+
message_id: arguments.fetch(:message_id, nil),
|
28
|
+
arguments: arguments,
|
29
|
+
)
|
23
30
|
end
|
24
31
|
|
25
32
|
def data=(value)
|
@@ -0,0 +1,39 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "rabbit"
|
4
|
+
require "rabbit/receiving/message"
|
5
|
+
require "rabbit/receiving/handler_resolver"
|
6
|
+
|
7
|
+
class Rabbit::Receiving::Queue
|
8
|
+
attr_reader :message, :arguments, :handler, :queue_name, :ignore_conversion
|
9
|
+
|
10
|
+
delegate :queue, to: :handler
|
11
|
+
|
12
|
+
def initialize(raw_message, arguments)
|
13
|
+
@message = Rabbit::Receiving::Message.build(raw_message, arguments)
|
14
|
+
@handler = Rabbit::Receiving::HandlerResolver.handler_for(message)
|
15
|
+
@arguments = arguments
|
16
|
+
@queue_name = resolved_queue_name
|
17
|
+
@ignore_conversion = handler.ignore_queue_conversion
|
18
|
+
end
|
19
|
+
|
20
|
+
def name
|
21
|
+
if queue_name
|
22
|
+
calculated_queue_name
|
23
|
+
else
|
24
|
+
Rabbit.default_queue_name(ignore_conversion: ignore_conversion)
|
25
|
+
end
|
26
|
+
rescue
|
27
|
+
Rabbit.default_queue_name
|
28
|
+
end
|
29
|
+
|
30
|
+
private
|
31
|
+
|
32
|
+
def resolved_queue_name
|
33
|
+
queue.is_a?(Proc) ? queue.call(message, arguments) : queue
|
34
|
+
end
|
35
|
+
|
36
|
+
def calculated_queue_name
|
37
|
+
Rabbit.queue_name(queue_name, ignore_conversion: ignore_conversion)
|
38
|
+
end
|
39
|
+
end
|
@@ -0,0 +1,66 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
require "tainbox"
|
4
|
+
|
5
|
+
require "rabbit"
|
6
|
+
require "rabbit/receiving/queue"
|
7
|
+
require "rabbit/receiving/job"
|
8
|
+
|
9
|
+
class Rabbit::Receiving::Receive
|
10
|
+
include Tainbox
|
11
|
+
|
12
|
+
attribute :message
|
13
|
+
attribute :delivery_info
|
14
|
+
attribute :arguments
|
15
|
+
|
16
|
+
def call
|
17
|
+
log!
|
18
|
+
call_hooks(before_hooks)
|
19
|
+
process_message
|
20
|
+
call_hooks(after_hooks)
|
21
|
+
end
|
22
|
+
|
23
|
+
def log!
|
24
|
+
Rabbit.config.receive_logger.debug(
|
25
|
+
[message, delivery_info, arguments].join(" / "),
|
26
|
+
)
|
27
|
+
end
|
28
|
+
|
29
|
+
def process_message
|
30
|
+
job_class
|
31
|
+
.set(queue: queue)
|
32
|
+
.perform_later(message, message_info)
|
33
|
+
end
|
34
|
+
|
35
|
+
def call_hooks(hooks)
|
36
|
+
hooks.each do |hook_proc|
|
37
|
+
hook_proc.call(message, message_info)
|
38
|
+
end
|
39
|
+
end
|
40
|
+
|
41
|
+
def before_hooks
|
42
|
+
Rabbit.config.before_receiving_hooks || []
|
43
|
+
end
|
44
|
+
|
45
|
+
def after_hooks
|
46
|
+
Rabbit.config.after_receiving_hooks || []
|
47
|
+
end
|
48
|
+
|
49
|
+
def message_info
|
50
|
+
arguments.merge(
|
51
|
+
delivery_info.slice(:exchange, :routing_key),
|
52
|
+
)
|
53
|
+
end
|
54
|
+
|
55
|
+
def queue
|
56
|
+
Rabbit::Receiving::Queue.new(message, arguments).name
|
57
|
+
end
|
58
|
+
|
59
|
+
def job_class
|
60
|
+
Rabbit.config.receiving_job_class_callable&.call(
|
61
|
+
message: message,
|
62
|
+
delivery_info: delivery_info,
|
63
|
+
arguments: arguments,
|
64
|
+
) || Rabbit::Receiving::Job
|
65
|
+
end
|
66
|
+
end
|
@@ -3,52 +3,30 @@
|
|
3
3
|
require "sneakers"
|
4
4
|
|
5
5
|
require "rabbit"
|
6
|
-
require "rabbit/receiving/
|
7
|
-
require "rabbit/receiving/malformed_message"
|
8
|
-
require "rabbit/receiving/handler_resolver"
|
6
|
+
require "rabbit/receiving/receive"
|
9
7
|
|
10
|
-
|
11
|
-
|
8
|
+
class Rabbit::Receiving::Worker
|
9
|
+
include Sneakers::Worker
|
12
10
|
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
def work_with_params(message, delivery_info, arguments)
|
21
|
-
message = message.dup.force_encoding("UTF-8")
|
22
|
-
self.class.logger.debug([message, delivery_info, arguments].join(" / "))
|
23
|
-
job_class.set(queue: queue(message, arguments)).perform_later(message, arguments.to_h)
|
24
|
-
ack!
|
25
|
-
rescue => error
|
26
|
-
raise if Rabbit.config.environment == :test
|
27
|
-
Rabbit.config.exception_notifier.call(error)
|
28
|
-
requeue!
|
29
|
-
end
|
30
|
-
|
31
|
-
private
|
32
|
-
|
33
|
-
def queue(message, arguments)
|
34
|
-
message = Rabbit::Receiving::Message.build(message, arguments)
|
35
|
-
handler = Rabbit::Receiving::HandlerResolver.handler_for(message)
|
36
|
-
queue_name = handler.queue
|
37
|
-
ignore_conversion = handler.ignore_queue_conversion
|
38
|
-
|
39
|
-
return Rabbit.default_queue_name(ignore_conversion: ignore_conversion) unless queue_name
|
40
|
-
|
41
|
-
calculated_queue = begin
|
42
|
-
queue_name.is_a?(Proc) ? queue_name.call(message, arguments) : queue_name
|
43
|
-
end
|
11
|
+
def work_with_params(message, delivery_info, arguments)
|
12
|
+
# args and info have custom rabbit classes, have to convert them to hash
|
13
|
+
receive_message(message, delivery_info.to_h, arguments.to_h)
|
14
|
+
ack!
|
15
|
+
rescue => error
|
16
|
+
handle_error!(error)
|
17
|
+
end
|
44
18
|
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
19
|
+
def receive_message(message, delivery_info, arguments)
|
20
|
+
Rabbit::Receiving::Receive.new(
|
21
|
+
message: message.dup.force_encoding("UTF-8"),
|
22
|
+
delivery_info: delivery_info,
|
23
|
+
arguments: arguments,
|
24
|
+
).call
|
25
|
+
end
|
49
26
|
|
50
|
-
|
51
|
-
|
52
|
-
|
27
|
+
def handle_error!(error)
|
28
|
+
raise if Rabbit.config.environment == :test
|
29
|
+
Rabbit.config.exception_notifier.call(error)
|
30
|
+
requeue!
|
53
31
|
end
|
54
32
|
end
|
data/lib/rabbit/version.rb
CHANGED
data/rabbit_messaging.gemspec
CHANGED
@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
|
|
5
5
|
require "rabbit/version"
|
6
6
|
|
7
7
|
Gem::Specification.new do |spec|
|
8
|
-
spec.required_ruby_version = ">= 2.
|
8
|
+
spec.required_ruby_version = ">= 2.5"
|
9
9
|
|
10
10
|
spec.name = "rabbit_messaging"
|
11
11
|
spec.version = Rabbit::VERSION
|
@@ -22,17 +22,17 @@ Gem::Specification.new do |spec|
|
|
22
22
|
spec.add_runtime_dependency "bunny", "~> 2.0"
|
23
23
|
spec.add_runtime_dependency "exception_notification"
|
24
24
|
spec.add_runtime_dependency "lamian"
|
25
|
-
spec.add_runtime_dependency "rails"
|
25
|
+
spec.add_runtime_dependency "rails", ">= 5.2"
|
26
26
|
spec.add_runtime_dependency "sneakers", "~> 2.0"
|
27
27
|
spec.add_runtime_dependency "tainbox"
|
28
28
|
|
29
29
|
spec.add_development_dependency "bundler"
|
30
30
|
spec.add_development_dependency "bundler-audit"
|
31
|
-
spec.add_development_dependency "coveralls"
|
32
31
|
spec.add_development_dependency "pry"
|
33
32
|
spec.add_development_dependency "rake"
|
34
33
|
spec.add_development_dependency "rspec"
|
35
34
|
spec.add_development_dependency "rspec-its"
|
36
35
|
spec.add_development_dependency "rubocop-config-umbrellio"
|
37
|
-
spec.add_development_dependency "simplecov"
|
36
|
+
spec.add_development_dependency "simplecov", ">= 0.21"
|
37
|
+
spec.add_development_dependency "simplecov-lcov"
|
38
38
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: rabbit_messaging
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.11.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Umbrellio
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-05-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bunny
|
@@ -58,14 +58,14 @@ dependencies:
|
|
58
58
|
requirements:
|
59
59
|
- - ">="
|
60
60
|
- !ruby/object:Gem::Version
|
61
|
-
version: '
|
61
|
+
version: '5.2'
|
62
62
|
type: :runtime
|
63
63
|
prerelease: false
|
64
64
|
version_requirements: !ruby/object:Gem::Requirement
|
65
65
|
requirements:
|
66
66
|
- - ">="
|
67
67
|
- !ruby/object:Gem::Version
|
68
|
-
version: '
|
68
|
+
version: '5.2'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: sneakers
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -123,7 +123,7 @@ dependencies:
|
|
123
123
|
- !ruby/object:Gem::Version
|
124
124
|
version: '0'
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
|
-
name:
|
126
|
+
name: pry
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
129
|
- - ">="
|
@@ -137,7 +137,7 @@ dependencies:
|
|
137
137
|
- !ruby/object:Gem::Version
|
138
138
|
version: '0'
|
139
139
|
- !ruby/object:Gem::Dependency
|
140
|
-
name:
|
140
|
+
name: rake
|
141
141
|
requirement: !ruby/object:Gem::Requirement
|
142
142
|
requirements:
|
143
143
|
- - ">="
|
@@ -151,7 +151,7 @@ dependencies:
|
|
151
151
|
- !ruby/object:Gem::Version
|
152
152
|
version: '0'
|
153
153
|
- !ruby/object:Gem::Dependency
|
154
|
-
name:
|
154
|
+
name: rspec
|
155
155
|
requirement: !ruby/object:Gem::Requirement
|
156
156
|
requirements:
|
157
157
|
- - ">="
|
@@ -165,7 +165,7 @@ dependencies:
|
|
165
165
|
- !ruby/object:Gem::Version
|
166
166
|
version: '0'
|
167
167
|
- !ruby/object:Gem::Dependency
|
168
|
-
name: rspec
|
168
|
+
name: rspec-its
|
169
169
|
requirement: !ruby/object:Gem::Requirement
|
170
170
|
requirements:
|
171
171
|
- - ">="
|
@@ -179,7 +179,7 @@ dependencies:
|
|
179
179
|
- !ruby/object:Gem::Version
|
180
180
|
version: '0'
|
181
181
|
- !ruby/object:Gem::Dependency
|
182
|
-
name:
|
182
|
+
name: rubocop-config-umbrellio
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
184
184
|
requirements:
|
185
185
|
- - ">="
|
@@ -193,21 +193,21 @@ dependencies:
|
|
193
193
|
- !ruby/object:Gem::Version
|
194
194
|
version: '0'
|
195
195
|
- !ruby/object:Gem::Dependency
|
196
|
-
name:
|
196
|
+
name: simplecov
|
197
197
|
requirement: !ruby/object:Gem::Requirement
|
198
198
|
requirements:
|
199
199
|
- - ">="
|
200
200
|
- !ruby/object:Gem::Version
|
201
|
-
version: '0'
|
201
|
+
version: '0.21'
|
202
202
|
type: :development
|
203
203
|
prerelease: false
|
204
204
|
version_requirements: !ruby/object:Gem::Requirement
|
205
205
|
requirements:
|
206
206
|
- - ">="
|
207
207
|
- !ruby/object:Gem::Version
|
208
|
-
version: '0'
|
208
|
+
version: '0.21'
|
209
209
|
- !ruby/object:Gem::Dependency
|
210
|
-
name: simplecov
|
210
|
+
name: simplecov-lcov
|
211
211
|
requirement: !ruby/object:Gem::Requirement
|
212
212
|
requirements:
|
213
213
|
- - ">="
|
@@ -227,10 +227,10 @@ executables: []
|
|
227
227
|
extensions: []
|
228
228
|
extra_rdoc_files: []
|
229
229
|
files:
|
230
|
+
- ".github/workflows/test.yml"
|
230
231
|
- ".gitignore"
|
231
232
|
- ".rspec"
|
232
233
|
- ".rubocop.yml"
|
233
|
-
- ".travis.yml"
|
234
234
|
- CHANGELOG.md
|
235
235
|
- Gemfile
|
236
236
|
- LICENSE.md
|
@@ -244,6 +244,7 @@ files:
|
|
244
244
|
- lib/rabbit/event_handler.rb
|
245
245
|
- lib/rabbit/extensions/bunny/channel.rb
|
246
246
|
- lib/rabbit/publishing.rb
|
247
|
+
- lib/rabbit/publishing/channels_pool.rb
|
247
248
|
- lib/rabbit/publishing/job.rb
|
248
249
|
- lib/rabbit/publishing/message.rb
|
249
250
|
- lib/rabbit/receiving.rb
|
@@ -251,6 +252,8 @@ files:
|
|
251
252
|
- lib/rabbit/receiving/job.rb
|
252
253
|
- lib/rabbit/receiving/malformed_message.rb
|
253
254
|
- lib/rabbit/receiving/message.rb
|
255
|
+
- lib/rabbit/receiving/queue.rb
|
256
|
+
- lib/rabbit/receiving/receive.rb
|
254
257
|
- lib/rabbit/receiving/worker.rb
|
255
258
|
- lib/rabbit/test_helpers.rb
|
256
259
|
- lib/rabbit/version.rb
|
@@ -259,7 +262,7 @@ files:
|
|
259
262
|
homepage: https://github.com/umbrellio/rabbit_messaging
|
260
263
|
licenses: []
|
261
264
|
metadata: {}
|
262
|
-
post_install_message:
|
265
|
+
post_install_message:
|
263
266
|
rdoc_options: []
|
264
267
|
require_paths:
|
265
268
|
- lib
|
@@ -267,15 +270,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
267
270
|
requirements:
|
268
271
|
- - ">="
|
269
272
|
- !ruby/object:Gem::Version
|
270
|
-
version: 2.
|
273
|
+
version: '2.5'
|
271
274
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
272
275
|
requirements:
|
273
276
|
- - ">="
|
274
277
|
- !ruby/object:Gem::Version
|
275
278
|
version: '0'
|
276
279
|
requirements: []
|
277
|
-
rubygems_version: 3.
|
278
|
-
signing_key:
|
280
|
+
rubygems_version: 3.2.3
|
281
|
+
signing_key:
|
279
282
|
specification_version: 4
|
280
283
|
summary: Rabbit (Rabbit Messaging)
|
281
284
|
test_files: []
|
data/.travis.yml
DELETED
@@ -1,19 +0,0 @@
|
|
1
|
-
language: ruby
|
2
|
-
matrix:
|
3
|
-
fast_finish: true
|
4
|
-
include:
|
5
|
-
- rvm: 2.3
|
6
|
-
- rvm: 2.4
|
7
|
-
- rvm: 2.5
|
8
|
-
- rvm: 2.6
|
9
|
-
- rvm: ruby-head
|
10
|
-
allow_failures:
|
11
|
-
- rvm: ruby-head
|
12
|
-
sudo: false
|
13
|
-
cache: bundler
|
14
|
-
before_install: gem install bundler
|
15
|
-
script:
|
16
|
-
- mkdir log
|
17
|
-
- bundle exec rake bundle:audit
|
18
|
-
- bundle exec rubocop
|
19
|
-
- bundle exec rspec
|