From 33441d6602b9f3c8749870911277913141197335 Mon Sep 17 00:00:00 2001 From: wajdi Date: Sun, 24 May 2020 04:27:05 +0300 Subject: [PATCH 01/13] Add recipe for Jurry RabbitMQ Symfony Bundle --- .../1.0/config/packages/jurry_rabbitmq.yaml | 15 +++++++++++++++ jurry/amqp-symfony-bundle/1.0/manifest.json | 11 +++++++++++ 2 files changed, 26 insertions(+) create mode 100644 jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml create mode 100644 jurry/amqp-symfony-bundle/1.0/manifest.json diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml new file mode 100644 index 00000000..438d6429 --- /dev/null +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -0,0 +1,15 @@ +amqp_handler: +# You can define connection in both ways: as array or as a string +# connection: 'tcp://guest:guest@172.18.0.01:5672' + connection: + host: 172.18.0.1 + port: 5672 + user: guest + password: guest + queues_properties: + sync_queue: + name: stores_sync + message_ttl: 10000 # 10 seconds + async_queue: + name: stores_async + message_ttl: 10000 # 10 seconds diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json new file mode 100644 index 00000000..7dbd648d --- /dev/null +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -0,0 +1,11 @@ +{ + "bundles": { + "Jurry\\RabbitMQ\\AmqpHandlerBundle": ["all"] + }, + "copy-from-recipe": { + "config/": "%CONFIG_DIR%/" + }, + "gitignore": [ + ".idea/" + ] +} From ee5af59ebf9199daa5d1cb0807a6481d3d5b67e1 Mon Sep 17 00:00:00 2001 From: wajdi Date: Sun, 24 May 2020 22:05:54 +0300 Subject: [PATCH 02/13] Code review --- jurry/amqp-symfony-bundle/1.0/manifest.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 7dbd648d..740a5175 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -4,8 +4,5 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" - }, - "gitignore": [ - ".idea/" - ] + } } From 97264e3cbafeaedd0939552761502ba296be7511 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 20:05:34 +0300 Subject: [PATCH 03/13] Make connection always as string --- .../1.0/config/packages/jurry_rabbitmq.yaml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml index 438d6429..f6d4400e 100644 --- a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -1,11 +1,5 @@ amqp_handler: -# You can define connection in both ways: as array or as a string -# connection: 'tcp://guest:guest@172.18.0.01:5672' - connection: - host: 172.18.0.1 - port: 5672 - user: guest - password: guest + connection: 'tcp://guest:guest@172.18.0.01:5672' queues_properties: sync_queue: name: stores_sync From 1c89d86bf7d828ee26e6cf6b5c2c96dd741f902e Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 21:07:09 +0300 Subject: [PATCH 04/13] Update config --- .../amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml index f6d4400e..1948e0e9 100644 --- a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -1,5 +1,5 @@ amqp_handler: - connection: 'tcp://guest:guest@172.18.0.01:5672' + connection: 'tcp://guest:guest@localhost:5672' queues_properties: sync_queue: name: stores_sync From ebb6bd7490dcae21446f9cf0bc88b4eaba7f0868 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 21:20:59 +0300 Subject: [PATCH 05/13] Add environment variable --- .../1.0/config/packages/jurry_rabbitmq.yaml | 2 +- jurry/amqp-symfony-bundle/1.0/manifest.json | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml index 1948e0e9..ea606b7e 100644 --- a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -1,5 +1,5 @@ amqp_handler: - connection: 'tcp://guest:guest@localhost:5672' + connection: '%env' queues_properties: sync_queue: name: stores_sync diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 740a5175..c865079e 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -4,5 +4,8 @@ }, "copy-from-recipe": { "config/": "%CONFIG_DIR%/" + }, + "env": { + "RABBIT_MQ_DSN": "tcp://guest:guest@172.18.0.01:5672" } } From 91c09b14e5d0e8586d46388528e8fd9ee71aa46f Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 21:30:27 +0300 Subject: [PATCH 06/13] Update env variable value --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index c865079e..13453ff3 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@172.18.0.01:5672" + "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" } } From 1c041ae445189dfef38cb6b6546f5765866b6929 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 21:37:34 +0300 Subject: [PATCH 07/13] Update env variable --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 13453ff3..1fb1f3af 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" + "RABBIT_MQ_DSN": "tcp://guest:guest@localhost:5672" } } From 1986942a466b2352b885ecec2df1a49a8af3e0b9 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 22:44:11 +0300 Subject: [PATCH 08/13] Fixes --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 1fb1f3af..13453ff3 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@localhost:5672" + "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" } } From de6942c5f5e89633ffcf8eb19aed58a7de08d0a3 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 22:47:41 +0300 Subject: [PATCH 09/13] Fixes --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 13453ff3..1fb1f3af 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" + "RABBIT_MQ_DSN": "tcp://guest:guest@localhost:5672" } } From 89278604cf0bf8cdbe97e3d010e23f94cdd95d50 Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 22:50:40 +0300 Subject: [PATCH 10/13] Fix RABBIT_MQ_DSN env variable --- .../amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml index ea606b7e..f75b910f 100644 --- a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -1,5 +1,5 @@ amqp_handler: - connection: '%env' + connection: '%env(RABBIT_MQ_DSN)%' queues_properties: sync_queue: name: stores_sync From eced14d9afd8cb66e79632d7aae7766f366ffe4d Mon Sep 17 00:00:00 2001 From: wajdi Date: Tue, 26 May 2020 22:54:20 +0300 Subject: [PATCH 11/13] Fixes --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 1fb1f3af..13453ff3 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@localhost:5672" + "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" } } From 8b1b30197d287a498f979e3ff1f0e2b371978c57 Mon Sep 17 00:00:00 2001 From: wajdi Date: Wed, 27 May 2020 00:36:04 +0300 Subject: [PATCH 12/13] Add vendor prefix to env variable --- .../amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml | 2 +- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml index f75b910f..27b7b26f 100644 --- a/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml +++ b/jurry/amqp-symfony-bundle/1.0/config/packages/jurry_rabbitmq.yaml @@ -1,5 +1,5 @@ amqp_handler: - connection: '%env(RABBIT_MQ_DSN)%' + connection: '%env(JURRY_RABBIT_MQ_DSN)%' queues_properties: sync_queue: name: stores_sync diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 13453ff3..93e03bc8 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" + "JURRY_RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" } } From b7ecfd6012e7f1078f4120db8f774f992e5ef538 Mon Sep 17 00:00:00 2001 From: wajdi Date: Wed, 27 May 2020 00:42:19 +0300 Subject: [PATCH 13/13] Let default connection string tcp://guest:guest@localhost:5672 --- jurry/amqp-symfony-bundle/1.0/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jurry/amqp-symfony-bundle/1.0/manifest.json b/jurry/amqp-symfony-bundle/1.0/manifest.json index 93e03bc8..c0215977 100644 --- a/jurry/amqp-symfony-bundle/1.0/manifest.json +++ b/jurry/amqp-symfony-bundle/1.0/manifest.json @@ -6,6 +6,6 @@ "config/": "%CONFIG_DIR%/" }, "env": { - "JURRY_RABBIT_MQ_DSN": "tcp://guest:guest@127.0.0.1:5672" + "JURRY_RABBIT_MQ_DSN": "tcp://guest:guest@localhost:5672" } }