Piotr Kliczewski has uploaded a new change for review.
Change subject: stomp: broker cleanup
......................................................................
stomp: broker cleanup
We can remove engine 3.5 supported queue names since we do not support
this version anymore.
Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca
Signed-off-by: Piotr Kliczewski <piotr.kliczew...@gmail.com>
---
M lib/yajsonrpc/stomp.py
M lib/yajsonrpc/stompreactor.py
2 files changed, 2 insertions(+), 13 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/81/65681/1
diff --git a/lib/yajsonrpc/stomp.py b/lib/yajsonrpc/stomp.py
index 41ac70f..558c519 100644
--- a/lib/yajsonrpc/stomp.py
+++ b/lib/yajsonrpc/stomp.py
@@ -22,11 +22,6 @@
from vdsm import utils
import re
-# REQUIRED_FOR: engine-3.5
-# safe to remove when 3.5 support is dropped
-LEGACY_SUBSCRIPTION_ID_REQUEST = "/queue/_local/vdsm/requests"
-LEGACY_SUBSCRIPTION_ID_RESPONSE = "/queue/_local/vdsm/reponses"
-
_RE_ESCAPE_SEQUENCE = re.compile(r"\\(.)")
_RE_ENCODE_CHARS = re.compile(r"[\r\n\\:]")
diff --git a/lib/yajsonrpc/stompreactor.py b/lib/yajsonrpc/stompreactor.py
index 233bee3..42d7d01 100644
--- a/lib/yajsonrpc/stompreactor.py
+++ b/lib/yajsonrpc/stompreactor.py
@@ -200,11 +200,6 @@
frame.headers.get(stomp.Headers.REPLY_TO),
frame.body)
return
- elif stomp.LEGACY_SUBSCRIPTION_ID_REQUEST == destination:
- self._handle_internal(dispatcher,
- stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE,
- frame.body)
- return
else:
try:
subs = self._sub_dests[destination]
@@ -323,7 +318,7 @@
"""
Sends message to all subscribes that subscribed to destination.
"""
- def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE):
+ def send(self, message, destination):
resp = json.loads(message)
response_id = resp.get("id")
@@ -414,8 +409,7 @@
self._reactor.wakeup()
return sub
- def send(self, message, destination=stomp.LEGACY_SUBSCRIPTION_ID_RESPONSE,
- headers=None):
+ def send(self, message, destination, headers=None):
self.log.debug("Sending response")
self._aclient.send(
destination,
--
To view, visit https://gerrit.ovirt.org/65681
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I972268a72f51975eb78c6bac926e29ac53178dca
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczew...@gmail.com>
_______________________________________________
vdsm-patches mailing list -- vdsm-patches@lists.fedorahosted.org
To unsubscribe send an email to vdsm-patches-le...@lists.fedorahosted.org
