Skip to content

Commit 6fab552

Browse files
makasimmakasim
authored
Merge pull request #238 from php-enqueue/0.8
0.8v goes stable.
2 parents 5f6fd8d + dc2a470 commit 6fab552

File tree

154 files changed

+3494
-4079
lines changed

Some content is hidden

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

154 files changed

+3494
-4079
lines changed

Diff for: ‎bin/subtree-split

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function split()
1111

1212

1313
SHA1=`./bin/splitsh-lite --prefix=$1`
14-
git push $2 "$SHA1:$CURRENT_BRANCH"
14+
git push $2 "$SHA1:refs/heads/$CURRENT_BRANCH"
1515
}
1616

1717
function split_new_repo()

Diff for: ‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
"enqueue/test": "*@dev",
2828
"enqueue/async-event-dispatcher": "*@dev",
2929
"queue-interop/queue-interop": "^0.6@dev",
30-
"queue-interop/amqp-interop": "^0.6@dev",
31-
"queue-interop/queue-spec": "^0.5@dev",
30+
"queue-interop/amqp-interop": "^0.7@dev",
31+
"queue-interop/queue-spec": "^0.5.1@dev",
3232

3333
"phpunit/phpunit": "^5",
3434
"doctrine/doctrine-bundle": "~1.2",

Diff for: ‎docker/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN echo "extension=rdkafka.so" > /etc/php/7.1/cli/conf.d/10-rdkafka.ini
1717
RUN echo "extension=rdkafka.so" > /etc/php/7.1/fpm/conf.d/10-rdkafka.ini
1818

1919
COPY ./php/cli.ini /etc/php/7.1/cli/conf.d/1-dev_cli.ini
20+
COPY ./php/amqp.so /usr/lib/php/20160303/amqp.so
2021
COPY ./bin/dev_entrypoiny.sh /usr/local/bin/entrypoint.sh
2122
RUN chmod u+x /usr/local/bin/entrypoint.sh
2223

Diff for: ‎docker/php/amqp.so

609 KB
Binary file not shown.

Diff for: ‎docs/bundle/cli_commands.md

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Options:
2929
--setup-broker Creates queues, topics, exchanges, binding etc on broker side.
3030
--idle-timeout=IDLE-TIMEOUT The time in milliseconds queue consumer idle if no message has been received.
3131
--receive-timeout=RECEIVE-TIMEOUT The time in milliseconds queue consumer waits for a message.
32+
--skip[=SKIP] Queues to skip consumption of messages from (multiple values allowed)
3233
-h, --help Display this help message
3334
-q, --quiet Do not output any message
3435
-V, --version Display this application version

Diff for: ‎docs/bundle/config_reference.md

+50-145
Original file line numberDiff line numberDiff line change
@@ -39,148 +39,103 @@ enqueue:
3939
# The option tells whether RabbitMQ broker has delay plugin installed or not
4040
delay_plugin_installed: false
4141
amqp:
42+
driver: ~ # One of "ext"; "lib"; "bunny"
4243

43-
# The connection to AMQP broker set as a string. Other parameters are ignored if set
44+
# The connection to AMQP broker set as a string. Other parameters could be used as defaults
4445
dsn: ~
4546

4647
# The host to connect too. Note: Max 1024 characters
47-
host: localhost
48+
host: ~
4849

4950
# Port on the host.
50-
port: 5672
51+
port: ~
5152

5253
# The user name to use. Note: Max 128 characters.
53-
user: guest
54+
user: ~
5455

5556
# Password. Note: Max 128 characters.
56-
pass: guest
57+
pass: ~
5758

5859
# The virtual host on the host. Note: Max 128 characters.
59-
vhost: /
60+
vhost: ~
6061

6162
# Connection timeout. Note: 0 or greater seconds. May be fractional.
62-
connect_timeout: ~
63+
connection_timeout: ~
6364

6465
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
6566
read_timeout: ~
6667

6768
# Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.
6869
write_timeout: ~
69-
persisted: false
70-
lazy: true
7170

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"
74-
rabbitmq_amqp:
71+
# How often to send heartbeat. 0 means off.
72+
heartbeat: ~
73+
persisted: ~
74+
lazy: ~
7575

76-
# The connection to AMQP broker set as a string. Other parameters are ignored if set
77-
dsn: ~
78-
79-
# The host to connect too. Note: Max 1024 characters
80-
host: localhost
81-
82-
# Port on the host.
83-
port: 5672
84-
85-
# The user name to use. Note: Max 128 characters.
86-
user: guest
87-
88-
# Password. Note: Max 128 characters.
89-
pass: guest
90-
91-
# The virtual host on the host. Note: Max 128 characters.
92-
vhost: /
93-
94-
# Connection timeout. Note: 0 or greater seconds. May be fractional.
95-
connect_timeout: ~
76+
# 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
77+
receive_method: ~ # One of "basic_get"; "basic_consume"
9678

97-
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
98-
read_timeout: ~
79+
# The server will send a message in advance if it is equal to or smaller in size than the available prefetch size. May be set to zero, meaning "no specific limit"
80+
qos_prefetch_size: ~
9981

100-
# Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.
101-
write_timeout: ~
102-
persisted: false
103-
lazy: true
82+
# Specifies a prefetch window in terms of whole messages
83+
qos_prefetch_count: ~
10484

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"
85+
# If "false" the QoS settings apply to the current channel only. If this field is "true", they are applied to the entire connection.
86+
qos_global: ~
10787

108-
# The delay strategy to be used. Possible values are "dlx", "delayed_message_plugin" or service id
109-
delay_strategy: dlx
110-
amqp_lib:
88+
# The options that are specific to the amqp transport you chose. For example amqp+lib have insist, keepalive, stream options. amqp+bunny has tcp_nodelay extra option.
89+
driver_options: ~
90+
rabbitmq_amqp:
91+
driver: ~ # One of "ext"; "lib"; "bunny"
11192

112-
# The connection to AMQP broker set as a string. Other parameters are ignored if set
93+
# The connection to AMQP broker set as a string. Other parameters could be used as defaults
11394
dsn: ~
11495

11596
# The host to connect too. Note: Max 1024 characters
116-
host: localhost
97+
host: ~
11798

11899
# Port on the host.
119-
port: 5672
100+
port: ~
120101

121102
# The user name to use. Note: Max 128 characters.
122-
user: guest
103+
user: ~
123104

124105
# Password. Note: Max 128 characters.
125-
pass: guest
106+
pass: ~
126107

127108
# The virtual host on the host. Note: Max 128 characters.
128-
vhost: /
109+
vhost: ~
129110

130111
# Connection timeout. Note: 0 or greater seconds. May be fractional.
131-
connection_timeout: !!float 3
132-
read_write_timeout: !!float 3
112+
connection_timeout: ~
133113

134114
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
135-
read_timeout: 3
115+
read_timeout: ~
136116

137117
# 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
118+
write_timeout: ~
160119

161-
# Password. Note: Max 128 characters.
162-
pass: guest
120+
# How often to send heartbeat. 0 means off.
121+
heartbeat: ~
122+
persisted: ~
123+
lazy: ~
163124

164-
# The virtual host on the host. Note: Max 128 characters.
165-
vhost: /
125+
# 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
126+
receive_method: ~ # One of "basic_get"; "basic_consume"
166127

167-
# Connection timeout. Note: 0 or greater seconds. May be fractional.
168-
connection_timeout: !!float 3
169-
read_write_timeout: !!float 3
128+
# The server will send a message in advance if it is equal to or smaller in size than the available prefetch size. May be set to zero, meaning "no specific limit"
129+
qos_prefetch_size: ~
170130

171-
# Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
172-
read_timeout: 3
131+
# Specifies a prefetch window in terms of whole messages
132+
qos_prefetch_count: ~
173133

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
134+
# If "false" the QoS settings apply to the current channel only. If this field is "true", they are applied to the entire connection.
135+
qos_global: ~
180136

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
137+
# The options that are specific to the amqp transport you chose. For example amqp+lib have insist, keepalive, stream options. amqp+bunny has tcp_nodelay extra option.
138+
driver_options: ~
184139

185140
# The delay strategy to be used. Possible values are "dlx", "delayed_message_plugin" or service id
186141
delay_strategy: dlx
@@ -197,6 +152,9 @@ enqueue:
197152

198153
# The queue files are created with this given permissions if not exist.
199154
chmod: 384
155+
156+
# How often query for new messages.
157+
polling_interval: 100
200158
redis:
201159

202160
# can be a host, or the path to a unix domain socket
@@ -238,57 +196,6 @@ enqueue:
238196

239197
# the connection will be performed as later as possible, if the option set to true
240198
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 delay strategy to be used. Possible values are "dlx", "delayed_message_plugin" or service id
291-
delay_strategy: dlx
292199
client:
293200
traceable_producer: false
294201
prefix: enqueue
@@ -313,8 +220,6 @@ enqueue:
313220
doctrine_clear_identity_map_extension: false
314221
signal_extension: true
315222
reply_extension: true
316-
317-
318223
```
319224
320225
[back to index](../index.md)

Diff for: ‎docs/bundle/quick_tour.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ It adds easy to use [configuration layer](config_reference.md), register service
66
## Install
77

88
```bash
9-
$ composer require enqueue/enqueue-bundle enqueue/amqp-ext
9+
$ composer require enqueue/enqueue-bundle enqueue/amqp-ext # or enqueue/amqp-bunny, enqueue/amqp-lib
1010
```
1111

1212
_**Note**: You could use not only AMQP transport but other available: STOMP, Amazon SQS, Redis, Filesystem, Doctrine DBAL and others._
@@ -47,7 +47,7 @@ First, you have to configure a transport layer and set one to be default.
4747

4848
enqueue:
4949
transport:
50-
default: "amqp://"
50+
default: "amqp:"
5151
client: ~
5252
```
5353

Diff for: ‎docs/client/quick_tour.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use Enqueue\SimpleClient\SimpleClient;
2222

2323
include __DIR__.'/vendor/autoload.php';
2424

25-
$client = new SimpleClient('amqp://');
25+
$client = new SimpleClient('amqp:');
2626
```
2727

2828
## Produce message

0 commit comments

Comments
 (0)