Skip to content

Commit 1840eca

Browse files
authored
Merge pull request #153 from php-enqueue/amqp-bunny
Amqp bunny
2 parents 06fd596 + 79c098c commit 1840eca

50 files changed

Lines changed: 3515 additions & 21 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bin/dev‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ while getopts "bustefcd" OPTION; do
2727
COMPOSE_PROJECT_NAME=mqdev docker-compose run -e CHANGELOG_GITHUB_TOKEN=${CHANGELOG_GITHUB_TOKEN:-""} --workdir="/mqdev" --rm generate-changelog github_changelog_generator --future-release "$2" --simple-list
2828
;;
2929

30-
d) COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue
30+
d) COMPOSE_PROJECT_NAME=mqdev docker-compose run --workdir="/mqdev" --rm dev php pkg/enqueue-bundle/Tests/Functional/app/console.php config:dump-reference enqueue -vvv
3131
;;
3232
\?)
3333
echo "Invalid option: -$OPTARG" >&2

‎composer.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"enqueue/stomp": "*@dev",
99
"enqueue/amqp-ext": "*@dev",
1010
"enqueue/amqp-lib": "*@dev",
11+
"enqueue/amqp-bunny": "*@dev",
1112
"php-amqplib/php-amqplib": "^2.7@dev",
1213
"enqueue/redis": "*@dev",
1314
"enqueue/fs": "*@dev",
@@ -79,6 +80,10 @@
7980
"type": "path",
8081
"url": "pkg/amqp-lib"
8182
},
83+
{
84+
"type": "path",
85+
"url": "pkg/amqp-bunny"
86+
},
8287
{
8388
"type": "path",
8489
"url": "pkg/redis"

‎docs/bundle/config_reference.md‎

Lines changed: 135 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@ enqueue:
6868
write_timeout: ~
6969
persisted: false
7070
lazy: true
71+
72+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
73+
receive_method: basic_get # One of "basic_get"; "basic_consume"
7174
rabbitmq_amqp:
7275

7376
# The connection to AMQP broker set as a string. Other parameters are ignored if set
@@ -99,6 +102,86 @@ enqueue:
99102
persisted: false
100103
lazy: true
101104

105+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
106+
receive_method: basic_get # One of "basic_get"; "basic_consume"
107+
108+
# The option tells whether RabbitMQ broker has delay plugin installed or not
109+
delay_plugin_installed: false
110+
amqp_lib:
111+
112+
# The connection to AMQP broker set as a string. Other parameters are ignored if set
113+
dsn: ~
114+
115+
# The host to connect too. Note: Max 1024 characters
116+
host: localhost
117+
118+
# Port on the host.
119+
port: 5672
120+
121+
# The user name to use. Note: Max 128 characters.
122+
user: guest
123+
124+
# Password. Note: Max 128 characters.
125+
pass: guest
126+
127+
# The virtual host on the host. Note: Max 128 characters.
128+
vhost: /
129+
130+
# Connection timeout. Note: 0 or greater seconds. May be fractional.
131+
connection_timeout: !!float 3
132+
read_write_timeout: !!float 3
133+
134+
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
135+
read_timeout: 3
136+
137+
# Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.
138+
write_timeout: 3
139+
lazy: true
140+
stream: true
141+
insist: false
142+
keepalive: false
143+
144+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
145+
receive_method: basic_get # One of "basic_get"; "basic_consume"
146+
heartbeat: 0
147+
rabbitmq_amqp_lib:
148+
149+
# The connection to AMQP broker set as a string. Other parameters are ignored if set
150+
dsn: ~
151+
152+
# The host to connect too. Note: Max 1024 characters
153+
host: localhost
154+
155+
# Port on the host.
156+
port: 5672
157+
158+
# The user name to use. Note: Max 128 characters.
159+
user: guest
160+
161+
# Password. Note: Max 128 characters.
162+
pass: guest
163+
164+
# The virtual host on the host. Note: Max 128 characters.
165+
vhost: /
166+
167+
# Connection timeout. Note: 0 or greater seconds. May be fractional.
168+
connection_timeout: !!float 3
169+
read_write_timeout: !!float 3
170+
171+
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
172+
read_timeout: 3
173+
174+
# Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.
175+
write_timeout: 3
176+
lazy: true
177+
stream: true
178+
insist: false
179+
keepalive: false
180+
181+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
182+
receive_method: basic_get # One of "basic_get"; "basic_consume"
183+
heartbeat: 0
184+
102185
# The option tells whether RabbitMQ broker has delay plugin installed or not
103186
delay_plugin_installed: false
104187
fs:
@@ -155,19 +238,69 @@ enqueue:
155238

156239
# the connection will be performed as later as possible, if the option set to true
157240
lazy: true
241+
amqp_bunny:
242+
243+
# The connection to AMQP broker set as a string. Other parameters are ignored if set
244+
dsn: ~
245+
246+
# The host to connect too. Note: Max 1024 characters
247+
host: localhost
248+
249+
# Port on the host.
250+
port: 5672
251+
252+
# The user name to use. Note: Max 128 characters.
253+
user: guest
254+
255+
# Password. Note: Max 128 characters.
256+
pass: guest
257+
258+
# The virtual host on the host. Note: Max 128 characters.
259+
vhost: /
260+
lazy: true
261+
262+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
263+
receive_method: basic_get # One of "basic_get"; "basic_consume"
264+
heartbeat: 0
265+
rabbitmq_amqp_bunny:
266+
267+
# The connection to AMQP broker set as a string. Other parameters are ignored if set
268+
dsn: ~
269+
270+
# The host to connect too. Note: Max 1024 characters
271+
host: localhost
272+
273+
# Port on the host.
274+
port: 5672
275+
276+
# The user name to use. Note: Max 128 characters.
277+
user: guest
278+
279+
# Password. Note: Max 128 characters.
280+
pass: guest
281+
282+
# The virtual host on the host. Note: Max 128 characters.
283+
vhost: /
284+
lazy: true
285+
286+
# The receive strategy to be used. We suggest to use basic_consume as it is more performant. Though you need AMQP extension 1.9.1 or higher
287+
receive_method: basic_get # One of "basic_get"; "basic_consume"
288+
heartbeat: 0
289+
290+
# The option tells whether RabbitMQ broker has delay plugin installed or not
291+
delay_plugin_installed: false
158292
client:
159293
traceable_producer: false
160294
prefix: enqueue
161295
app_name: app
162-
router_topic: router
296+
router_topic: default
163297
router_queue: default
164298
router_processor: enqueue.client.router_processor
165299
default_processor_queue: default
166300
redelivered_delay_time: 0
167301
job: false
168302
async_events:
169303
enabled: false
170-
spool_producer: false
171304
extensions:
172305
doctrine_ping_connection_extension: false
173306
doctrine_clear_identity_map_extension: false

‎docs/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
* [Quick tour](quick_tour.md)
44
* Transports
5-
- Amqp based on [the ext](docs/transport/amqp.md), [the lib](docs/transport/amqp_lib.md)
5+
- Amqp based on [the ext](docs/transport/amqp.md), [bunny](docs/transport/amqp_bunny.md), [the lib](docs/transport/amqp_lib.md)
66
- [Amazon SQS](transport/sqs.md)
77
- [Beanstalk (Pheanstalk)](transport/pheanstalk.md)
88
- [Gearman](transport/gearman.md)

0 commit comments

Comments
 (0)