YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Ignore cache if "full" is specified

Browse source
This commit is contained in:
theo@manjaro 2022-07-12 10:45:35 +02:00
parent a2a1eefbed
commit f67eaef90b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/domain.py
View file

@ -61,7 +61,7 @@ def domain_list(exclude_subdomains=False,auto_push=False,full=False):
""" """
global domain_list_cache global domain_list_cache
if not exclude_subdomains and domain_list_cache: if not (exclude_subdomains or full) and domain_list_cache:
return domain_list_cache return domain_list_cache
from yunohost.utils.ldap import _get_ldap_interface from yunohost.utils.ldap import _get_ldap_interface
@ -93,7 +93,6 @@ def domain_list(exclude_subdomains=False,auto_push=False,full=False):
result_list = sorted(result_list, key=cmp_domain) result_list = sorted(result_list, key=cmp_domain)
# Don't cache answer if using exclude_subdomains
if exclude_subdomains: if exclude_subdomains:
return {"domains": result_list, "main": _get_maindomain()} return {"domains": result_list, "main": _get_maindomain()}
@ -102,8 +101,13 @@ def domain_list(exclude_subdomains=False,auto_push=False,full=False):
domain = result_list[i] domain = result_list[i]
result_list[i] = {'name':domain,'isdyndns': is_yunohost_dyndns_domain(domain)} result_list[i] = {'name':domain,'isdyndns': is_yunohost_dyndns_domain(domain)}
domain_list_cache = {"domains": result_list, "main": _get_maindomain()} result = {"domains": result_list, "main": _get_maindomain()}
return domain_list_cache
# Cache answer only if not using exclude_subdomains or full
if not (full or exclude_subdomains):
domain_list_cache = result
return result
def _assert_domain_exists(domain): def _assert_domain_exists(domain):