From 95c36591dddf90055a72cc03e8851370de35cd3b Mon Sep 17 00:00:00 2001 From: Alexander Kozienko Date: Mon, 5 Nov 2018 11:06:24 +0200 Subject: [PATCH 1/2] compatibility with 0.8x --- pkg/enqueue/Client/RouterProcessor.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/enqueue/Client/RouterProcessor.php b/pkg/enqueue/Client/RouterProcessor.php index c4832fd0f..82c882ed5 100644 --- a/pkg/enqueue/Client/RouterProcessor.php +++ b/pkg/enqueue/Client/RouterProcessor.php @@ -9,6 +9,11 @@ final class RouterProcessor implements Processor { + /** + * compatibility with 0.8x + */ + private const COMMAND_TOPIC_08X = '__command__'; + /** * @var DriverInterface */ @@ -21,6 +26,17 @@ public function __construct(DriverInterface $driver) public function process(InteropMessage $message, Context $context): Result { + // compatibility with 0.8x + if (self::COMMAND_TOPIC_08X === $message->getProperty(Config::TOPIC)) { + $clientMessage = $this->driver->createClientMessage($message); + $clientMessage->setProperty(Config::TOPIC, null); + + $this->driver->sendToProcessor($clientMessage); + + return Result::ack('Legacy 0.8x message routed to processor'); + } + // compatibility with 0.8x + if ($message->getProperty(Config::COMMAND)) { return Result::reject(sprintf( 'Unexpected command "%s" got. Command must not go to the router.', From c638694a6864bdff9dab6e77f64a232f9b9b4d08 Mon Sep 17 00:00:00 2001 From: Alexander Kozienko Date: Mon, 5 Nov 2018 14:32:03 +0200 Subject: [PATCH 2/2] compatibility with 0.8x --- pkg/enqueue/Client/RouterProcessor.php | 2 +- var/rabbitmq_certificates/cert.pem | 30 ++++++++-------- var/rabbitmq_certificates/key.pem | 50 +++++++++++++------------- 3 files changed, 41 insertions(+), 41 deletions(-) diff --git a/pkg/enqueue/Client/RouterProcessor.php b/pkg/enqueue/Client/RouterProcessor.php index 82c882ed5..c441ceb8b 100644 --- a/pkg/enqueue/Client/RouterProcessor.php +++ b/pkg/enqueue/Client/RouterProcessor.php @@ -10,7 +10,7 @@ final class RouterProcessor implements Processor { /** - * compatibility with 0.8x + * compatibility with 0.8x. */ private const COMMAND_TOPIC_08X = '__command__'; diff --git a/var/rabbitmq_certificates/cert.pem b/var/rabbitmq_certificates/cert.pem index 8626b0ca5..12b395936 100644 --- a/var/rabbitmq_certificates/cert.pem +++ b/var/rabbitmq_certificates/cert.pem @@ -1,18 +1,18 @@ -----BEGIN CERTIFICATE----- -MIIC5TCCAc2gAwIBAgIBAjANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhNeVRl -c3RDQTAeFw0xNzExMDExMzE1NDBaFw0xODExMDExMzE1NDBaMCgxFTATBgNVBAMM -DGNiNzA0YmRhYWZjNjEPMA0GA1UECgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEAxLvg5RmUO3Ws+9D0Xh1l0k5Hg30jUWcyV4nCX2wJgxz5 -mjApsEYqSytE3Sr63Otl+yUugoL8gPdO7eWslWJycIWKFEWOmE7G3V89kjAd/sNP -U6Wo2j4T9pCRLogOuq54SPEEdn2HGPr+JaUYRvdsXZmLy6Wa1dnx3UemxKirKpmo -uxkqTfycZFKq8RQsOrMqMtZFExgN++ylNMDcl7rYG3cYduKN9uBq5Fwcl5oan76f -NvTnW++bolSOVa6wKTfPt9a+XcsAxx+XSrWx17HaegrTFMizFxTWOwqfNVCTmJkD -rI4GYoat1ymHlb5v0MQRaMSWi+USLmrKIEUqXbwHJwIDAQABoy8wLTAJBgNVHRME +MIIC5TCCAc2gAwIBAgIBBDANBgkqhkiG9w0BAQsFADATMREwDwYDVQQDDAhNeVRl +c3RDQTAeFw0xODExMDUxMDMyMjdaFw0yODExMDIxMDMyMjdaMCgxFTATBgNVBAMM +DDE4OGUzNGFjNWQ4MTEPMA0GA1UECgwGY2xpZW50MIIBIjANBgkqhkiG9w0BAQEF +AAOCAQ8AMIIBCgKCAQEA2pgaF9Dk7YtbE2/LJKnpDzwTeSWuvplVuysNW70P1AiD +9LMplvkYG1Jbmr8Tfd15LkkZi/IQroISuqFhol0IvflFT8t1Q5O/9rGFpRLujyiI +bidBaTszFNFPNjhPGyyw2eEQEHNzeAFpOdA0kWdYap3OI7DDdleU8SOLt4bLlwoD +ZC9S2RSpycFJL7JzfnjwkvtH3GVH2WYCukFYJsQGpQ/LbCHZ5ut+2cvM4BeKPH2B +YdfCRrrPsRxO9GDh1SW1uMaX4d4AsyM5twh+GCPMBDu5dQh4d7hqxN4hcqFr7mzp +m5H84x3CrAnuDo6Q8vyVv/3VzxnobptCz3nksQxIRQIDAQABoy8wLTAJBgNVHRME AjAAMAsGA1UdDwQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjANBgkqhkiG9w0B -AQsFAAOCAQEAhudxAnKUKXzlO2AvNYR561T9u1jTtIirInbMGPH4oVqcRyC47PeX -vrURQg5d1VOw4Sb1Ul+sM4ur4PLt990TsOt3NZiuEeam37Ra3oyxu+9XVobxOGnV -a/6mozFZGRcOzsbdX46DZtAl5NVJm5M1nHPNg1KqGZF+AVwTOPvPMWpn+IzckEHD -N/4jxM6FCzc5QRQKkyEOTQz848V0HDlXB9KSwgSIQ8yUXv2ozMeqxq6J+oXpzhb9 -wT2YUIGr9thoB7CwWjnFgG7MEXQ3wk1L1SzRz57a3r+rBIMHBNEkakAoq9VmzKLA -y6xpRqt0+CnvmQ9OIdY4jxUMVXxcQGjUnw== +AQsFAAOCAQEA16hw/R7sZ5d0ykwKFzcjYSN+Dl8mnka1PRfVGqxFluahytbvD3Ns +yzhdXD4iaTumuVqjyOSe7WfA4hE1Nb1aW2H6GhEzqDsFo/usmC6H6zH9HXVtI9wM +l7sa7THWh1BTNssRBtihpjhjlWzU6eQd7F7O3rhPoM0FeZ7S78ZCo8R86p72xaKg +Ttx+CNfUyvDEY35Jh5kYg/VW0V1/M6zsif0xEbSYTmEkirS4exdrk8Hy5q70V8ZN +UEHxXOcQRN+Y+SP8xFUWNjpRO/+P+ZapvXUd47FnZ12Hxyp9V+V1yqO24mv4RzpO +AMpTn8botOTbuvQXqzr398uOwxZ7RlTzIg== -----END CERTIFICATE----- diff --git a/var/rabbitmq_certificates/key.pem b/var/rabbitmq_certificates/key.pem index cc4315e85..8ec88ecd8 100644 --- a/var/rabbitmq_certificates/key.pem +++ b/var/rabbitmq_certificates/key.pem @@ -1,27 +1,27 @@ -----BEGIN RSA PRIVATE KEY----- -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 -----END RSA PRIVATE KEY-----