Revert stupid resolve code
This commit is contained in:
parent
74baa35a21
commit
f0a509049c
15
surok.py
15
surok.py
@ -68,16 +68,15 @@ while 1:
|
|||||||
conf['loglevel'] = 'info'
|
conf['loglevel'] = 'info'
|
||||||
|
|
||||||
# Resolve services
|
# Resolve services
|
||||||
if resolve(app_conf, conf) != 404:
|
app_hosts = resolve(app_conf, conf)
|
||||||
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'])
|
||||||
|
@ -45,30 +45,8 @@ 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'])
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user