Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

nagios/fedmsg: make changes yesterday remain py2 backwards compatible

Browse source 
Signed-off-by: Rick Elrod <relrod@redhat.com>
This commit is contained in:
Rick Elrod 2020-02-05 16:35:22 +00:00 • committed by Pierre-Yves Chibon
parent e1335cf937
commit 4e71722d8a
7 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py
View file

@ -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)

5
roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py
View file

@ -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)

5
roles/nagios_client/files/scripts/check_fedmsg_producer_last_ran.py
View file

@ -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)

5
roles/nagios_client/files/scripts/check_fedmsg_producers_consumers.py
View file

@ -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)

5
roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_backlog.py
View file

@ -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)

5
roles/nagios_server/files/nagios/plugins/check_fedmsg_consumer_exceptions.py
View file

@ -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)

5
roles/nagios_server/files/nagios/plugins/check_fedmsg_producers_consumers.py
View file

@ -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)