Difrex/surok
Difrex/surok
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix reload in empty discovery

Browse Source
This commit is contained in:
Difrex 2016-10-05 11:46:51 +03:00
parent f54a7e0ee8
commit f98677deb9
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
surok.py
View File

@ -68,15 +68,16 @@ while 1:
conf['loglevel'] = 'info' conf['loglevel'] = 'info'
# Resolve services # Resolve services
app_hosts = resolve(app_conf, conf) if resolve(app_conf, conf) != 404:
app_hosts = resolve(app_conf, conf)
# Populate my dictionary # Populate my dictionary
my = {"services": app_hosts, my = {"services": app_hosts,
"conf_name": app_conf['conf_name']} "conf_name": app_conf['conf_name']}
# Generate config from template # Generate config from template
service_conf = gen(my, app_conf['template']) service_conf = gen(my, app_conf['template'])
first = reload_conf(service_conf, app_conf, first, conf) first = reload_conf(service_conf, app_conf, first, conf)
sleep(conf['wait_time']) sleep(conf['wait_time'])

25
surok/discovery.py
View File

@ -40,8 +40,30 @@ def resolve(app, conf):
if ports is not None: if ports is not None:
for port_name in ports: for port_name in ports:
fqdn = '_' + port_name + '.' + '_' + service['name'] + '.' + group + '._tcp.' + domain fqdn = '_' + port_name + '.' + '_' + service['name'] + '.' + group + '._tcp.' + domain
# Fast fix of empty query result
# ------------------------------
try:
do_query_test = do_query(fqdn, conf['loglevel'])
if do_query_test['state'] == 404:
return 404
except:
pass
# ------------------------------
hosts[service['name']][port_name] = do_query(fqdn, conf['loglevel']) hosts[service['name']][port_name] = do_query(fqdn, conf['loglevel'])
else: else:
# Fast fix of empty query result
# ------------------------------
try:
do_query_test = do_query(fqdn, conf['loglevel'])
if do_query_test['state'] == 404:
return 404
except:
pass
# ------------------------------
fqdn = '_' + service['name'] + '.' + group + '._tcp.' + domain fqdn = '_' + service['name'] + '.' + group + '._tcp.' + domain
hosts[service['name']] = do_query(fqdn, conf['loglevel']) hosts[service['name']] = do_query(fqdn, conf['loglevel'])
@ -62,6 +84,7 @@ def do_query(fqdn, loglevel):
servers.append(server) servers.append(server)
except DNSException: except DNSException:
if loglevel != 'info': if loglevel != 'info':
logging.warning("Could not resolve " + fqdn) logging.error("Could not resolve " + fqdn)
return {"state": 404}
return servers return servers