python3-ize the fedmsg check scripts, and on py3 boxes make it check a valid socket path

Signed-off-by: Rick Elrod <relrod@redhat.com>
This commit is contained in:
Rick Elrod 2020-02-04 22:11:06 +00:00 committed by Pierre-Yves Chibon
parent 8cd7809278
commit 40e13bcbf0
8 changed files with 83 additions and 71 deletions

View file

@ -1,4 +1,4 @@
#!/usr/bin/python2
#!/usr/bin/python
import json
import os
@ -12,22 +12,22 @@ try:
fname = '/var/run/fedmsg/monitoring-%s.socket' % service
if not check_list:
print "UNKNOWN - empty list of fedmsg consumers and producers to check"
print("UNKNOWN - empty list of fedmsg consumers and producers to check")
sys.exit(3)
if not os.path.exists(fname):
print "UNKNOWN - %s does not exist" % fname
print("UNKNOWN - %s does not exist" % fname)
sys.exit(3)
if not os.access(fname, os.W_OK):
print "UNKNOWN - cannot write to %s" % fname
print("UNKNOWN - cannot write to %s" % fname)
sys.exit(3)
connect_to = "ipc:///%s" % fname
ctx = zmq.Context()
s = ctx.socket(zmq.SUB)
s.connect(connect_to)
s.setsockopt(zmq.SUBSCRIBE, '')
s.setsockopt_string(zmq.SUBSCRIBE, '')
poller = zmq.Poller()
poller.register(s, zmq.POLLIN)
@ -38,27 +38,27 @@ try:
msg = s.recv()
msg = json.loads(msg)
else:
print 'UNKNOWN - ZMQ timeout. No message received in %i ms' % timeout
print('UNKNOWN - ZMQ timeout. No message received in %i ms' % timeout)
sys.exit(3)
for consumer in msg['consumers']:
if consumer['name'] in check_list and not consumer['initialized']:
print 'ERROR: fedmsg consumer %s is not initialized' % consumer['name']
print('ERROR: fedmsg consumer %s is not initialized' % consumer['name'])
sys.exit(2)
for producer in msg['producers']:
if producer['name'] in check_list and not producer['initialized']:
print 'ERROR: fedmsg producer %s is not initialized' % producer['name']
print('ERROR: fedmsg producer %s is not initialized' % producer['name'])
sys.exit(2)
for item in check_list:
if item not in [p['name'] for p in msg['producers'] + msg['consumers']]:
print 'ERROR: %s not found among installed plugins' % item
print('ERROR: %s not found among installed plugins' % item)
sys.exit(2)
print "OK: fedmsg consumer(s) and producer(s) initialized"
print("OK: fedmsg consumer(s) and producer(s) initialized")
sys.exit(0)
except Exception as err:
print "UNKNOWN:", str(err)
print("UNKNOWN:", str(err))
sys.exit(3)