From 4e71722d8ac9f0ade211829980de39cf29c5015d Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Wed, 5 Feb 2020 16:35:22 +0000 Subject: [PATCH] nagios/fedmsg: make changes yesterday remain py2 backwards compatible Signed-off-by: Rick Elrod --- .../files/scripts/check_fedmsg_consumer_backlog.py | 5 ++++- .../files/scripts/check_fedmsg_consumer_exceptions.py | 5 ++++- .../files/scripts/check_fedmsg_producer_last_ran.py | 5 ++++- .../files/scripts/check_fedmsg_producers_consumers.py | 5 ++++- .../files/nagios/plugins/check_fedmsg_consumer_backlog.py | 5 ++++- .../files/nagios/plugins/check_fedmsg_consumer_exceptions.py | 5 ++++- .../files/nagios/plugins/check_fedmsg_producers_consumers.py | 5 ++++- 7 files changed, 28 insertions(+), 7 deletions(-) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py index 22afced9e1..56fc98c832 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py @@ -25,7 +25,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py index afed1af5f2..2f410ddb4a 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py @@ -25,7 +25,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py b/roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py index 7ac57bf2de..d41d07a44a 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py @@ -27,7 +27,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py b/roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py index c3bc307ac5..5029a5b5f9 100644 --- a/roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py +++ b/roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py @@ -27,7 +27,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_backlog.py b/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_backlog.py index 2ac43b5ee9..2357dd0008 100644 --- a/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_backlog.py +++ b/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_backlog.py @@ -21,7 +21,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_exceptions.py b/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_exceptions.py index 55870d99aa..a07d30cad5 100644 --- a/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_exceptions.py +++ b/roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_exceptions.py @@ -21,7 +21,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN) diff --git a/roles/nagios_server/files/nagios/plugins/check_fedmsg_producers_consumers.py b/roles/nagios_server/files/nagios/plugins/check_fedmsg_producers_consumers.py index 412c168091..d71aad7b12 100644 --- a/roles/nagios_server/files/nagios/plugins/check_fedmsg_producers_consumers.py +++ b/roles/nagios_server/files/nagios/plugins/check_fedmsg_producers_consumers.py @@ -23,7 +23,10 @@ try: ctx = zmq.Context() s = ctx.socket(zmq.SUB) s.connect(connect_to) - s.setsockopt_string(zmq.SUBSCRIBE, '') + try: + s.setsockopt(zmq.SUBSCRIBE, '') + except TypeError: + s.setsockopt_string(zmq.SUBSCRIBE, '') poller = zmq.Poller() poller.register(s, zmq.POLLIN)