mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Correct unix socket handling in discovery-wrapper to match poller-wrapper (#8214)

Browse Source
This commit is contained in:
tduehr
2018-02-09 15:09:56 -06:00
committed by Neil Lathwood
parent 9cc542bc6a
commit 2793958f05
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
discovery-wrapper.py
View File

@@ -89,22 +89,20 @@ db_username = config['db_user']
db_password = config['db_pass'] db_password = config['db_pass']
db_port = int(config['db_port']) db_port = int(config['db_port'])
if config['db_host'][:5].lower() == 'unix:': if config['db_socket']:
db_server = config['db_host'] db_server = config['db_host']
db_port = 0 db_socket = config['db_socket']
elif config['db_socket']:
db_server = config['db_socket']
db_port = 0
else: else:
db_server = config['db_host'] db_server = config['db_host']
db_socket = None
db_dbname = config['db_name'] db_dbname = config['db_name']
def db_open(): def db_open():
try: try:
if db_port == 0: if db_socket:
db = MySQLdb.connect(host=db_server, user=db_username, passwd=db_password, db=db_dbname) db = MySQLdb.connect(host=db_server, unix_socket=db_socket, user=db_username, passwd=db_password, db=db_dbname)
else: else:
db = MySQLdb.connect(host=db_server, port=db_port, user=db_username, passwd=db_password, db=db_dbname) db = MySQLdb.connect(host=db_server, port=db_port, user=db_username, passwd=db_password, db=db_dbname)
return db return db
@@ -112,6 +110,7 @@ def db_open():
print "ERROR: Could not connect to MySQL database!" print "ERROR: Could not connect to MySQL database!"
sys.exit(2) sys.exit(2)
# (c) 2015, GPLv3, Daniel Preussker <f0o@devilcode.org> <<<EOC1 # (c) 2015, GPLv3, Daniel Preussker <f0o@devilcode.org> <<<EOC1
if 'distributed_poller_group' in config: if 'distributed_poller_group' in config:
discovery_group = str(config['distributed_poller_group']) discovery_group = str(config['distributed_poller_group'])