Fix python3 compatibility
This commit is contained in:
parent
3c39ff7488
commit
9e6de5077f
1 changed files with 6 additions and 7 deletions
|
@ -48,7 +48,6 @@ import ldap.modlist as modlist
|
||||||
TOUCH_VALUE = '%%TOUCH%%'
|
TOUCH_VALUE = '%%TOUCH%%'
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(
|
parser = argparse.ArgumentParser(
|
||||||
version="%prog version 1.1",
|
|
||||||
description="Script to check LDAP syncrepl replication state between two servers.",
|
description="Script to check LDAP syncrepl replication state between two servers.",
|
||||||
epilog="Author: Benjamin Renard <brenard@easter-eggs.com>, Source: https://gogs.zionetrix.net/bn8/check_syncrepl_extended"
|
epilog="Author: Benjamin Renard <brenard@easter-eggs.com>, Source: https://gogs.zionetrix.net/bn8/check_syncrepl_extended"
|
||||||
)
|
)
|
||||||
|
@ -214,19 +213,19 @@ parser.add_argument(
|
||||||
options = parser.parse_args()
|
options = parser.parse_args()
|
||||||
|
|
||||||
if not options.provider or not options.consumer:
|
if not options.provider or not options.consumer:
|
||||||
print "You must provide provider and customer URI"
|
parser.error("You must provide provider and customer URI")
|
||||||
if options.nagios:
|
if options.nagios:
|
||||||
sys.exit(3)
|
sys.exit(3)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if not options.basedn:
|
if not options.basedn:
|
||||||
print "You must provide base DN of connection to LDAP servers"
|
parser.error("You must provide base DN of connection to LDAP servers")
|
||||||
if options.nagios:
|
if options.nagios:
|
||||||
sys.exit(3)
|
sys.exit(3)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
if not 0 <= options.serverid <= 4095:
|
if not 0 <= options.serverid <= 4095:
|
||||||
print "ServerID should be a integer value from 0 to 4095 (limited to 3 hexadecimal digits)."
|
parser.error("ServerID should be a integer value from 0 to 4095 (limited to 3 hexadecimal digits).")
|
||||||
if options.nagios:
|
if options.nagios:
|
||||||
sys.exit(3)
|
sys.exit(3)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
@ -419,7 +418,7 @@ for srv in servers:
|
||||||
|
|
||||||
if not LdapServers[srv].connect():
|
if not LdapServers[srv].connect():
|
||||||
if options.nagios:
|
if options.nagios:
|
||||||
print "UNKWNON - Failed to connect to %s" % srv
|
print("UNKWNON - Failed to connect to %s" % srv) # pylint: disable=print-statement
|
||||||
sys.exit(3)
|
sys.exit(3)
|
||||||
else:
|
else:
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
@ -549,10 +548,10 @@ if options.nagios:
|
||||||
for obj in not_sync[options.consumer]:
|
for obj in not_sync[options.consumer]:
|
||||||
long_output.append(" - %s" % obj)
|
long_output.append(" - %s" % obj)
|
||||||
if errors:
|
if errors:
|
||||||
print "CRITICAL: " + ', '.join(errors) + "\n\n" + "\n".join(long_output)
|
print("CRITICAL: " + ', '.join(errors) + "\n\n" + "\n".join(long_output)) # pylint: disable=print-statement
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
else:
|
else:
|
||||||
print 'OK: consumer and provider are synchronized'
|
print('OK: consumer and provider are synchronized') # pylint: disable=print-statement
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
else:
|
else:
|
||||||
noerror = True
|
noerror = True
|
||||||
|
|
Loading…
Reference in a new issue