From 432daefa993e6d05dd74c7029b66287409aa43e8 Mon Sep 17 00:00:00 2001 From: Denis Meltsaykin Date: Tue, 25 May 2021 14:39:02 +0200 Subject: [PATCH] [RabbitMQ] bugfixes to script Turned out the script doesn't work on older p3.5 due to differences in HTTP objects and the fact that our RabbitMQ configured with URL-encoded vhosts. Change-Id: I06f4d0c9dacc75cd45e57e348f9e960f1dabd415 --- scripts/rabbitmq_check.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/rabbitmq_check.py b/scripts/rabbitmq_check.py index fa21515..c95c7f3 100755 --- a/scripts/rabbitmq_check.py +++ b/scripts/rabbitmq_check.py @@ -20,7 +20,7 @@ import json import logging from typing import Any -from urllib import request as rq +from urllib import request as rq, parse as pr log = logging.getLogger("rabbitmq_check") log.addHandler(logging.StreamHandler()) @@ -43,7 +43,7 @@ parser.add_argument('-P', '--port', type=str, default='15672', help='API Port') parser.add_argument('-V', '--vhost', - type=str, default='openstack', + type=str, default='/openstack', help='Virtual Host to operate on') parser.add_argument('-s', '--ssl', action='store_true', default=False, help='Use SSL (WIP)') @@ -83,7 +83,7 @@ class APIConnector(): url, method, headers, body) with rq.urlopen(request) as data: - out = json.loads(data.read()) + out = json.loads(data.read().decode('utf-8')) return out @@ -91,6 +91,7 @@ class Checker(): def __init__(self, opts: argparse.Namespace) -> None: self.conn = APIConnector(opts) self.opts = opts + self.opts.vhost = pr.quote_plus(self.opts.vhost) def get_bindings(self): log.info( -- 2.45.2