From b2daba2494c08fbfb00977ac1c0e73dd3d7334ec Mon Sep 17 00:00:00 2001 From: Timur Duehr Date: Tue, 6 Feb 2018 17:54:43 -0600 Subject: [PATCH] correct unix socket handling to match poller-wrapper --- discovery-wrapper.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/discovery-wrapper.py b/discovery-wrapper.py index a4404b67b79f..f7f2389f06d3 100755 --- a/discovery-wrapper.py +++ b/discovery-wrapper.py @@ -89,22 +89,20 @@ def get_config_data(): db_password = config['db_pass'] db_port = int(config['db_port']) -if config['db_host'][:5].lower() == 'unix:': +if config['db_socket']: db_server = config['db_host'] - db_port = 0 -elif config['db_socket']: - db_server = config['db_socket'] - db_port = 0 + db_socket = config['db_socket'] else: db_server = config['db_host'] + db_socket = None db_dbname = config['db_name'] def db_open(): try: - if db_port == 0: - db = MySQLdb.connect(host=db_server, user=db_username, passwd=db_password, db=db_dbname) + if db_socket: + db = MySQLdb.connect(host=db_server, unix_socket=db_socket, user=db_username, passwd=db_password, db=db_dbname) else: db = MySQLdb.connect(host=db_server, port=db_port, user=db_username, passwd=db_password, db=db_dbname) return db @@ -112,6 +110,7 @@ def db_open(): print "ERROR: Could not connect to MySQL database!" sys.exit(2) + # (c) 2015, GPLv3, Daniel Preussker <<