masq
/
halfapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'devel_' of gite.lirmm.fr:malves/halfapi into devel_

This commit is contained in:
Maxime Alves LIRMM@home 2020-10-27 10:11:06 +01:00
parent 8bfdc8f428 e4fb3b8bb1
commit e121504e49
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
halfapi/cli/domain.py
View File

@ -10,7 +10,7 @@ import click
from .cli import cli from .cli import cli
from ..conf import config, write_config, DOMAINS, DOMAINSDICT from ..conf import config, write_config, DOMAINSDICT
from ..lib.schemas import schema_dict_dom from ..lib.schemas import schema_dict_dom
@ -84,11 +84,11 @@ def domain(domains, delete, update, create, read): #, domains, read, create, up
# TODO: Connect to the create_domain function # TODO: Connect to the create_domain function
raise NotImplementedError raise NotImplementedError
domains = DOMAINS domains = DOMAINSDICT().keys()
else: else:
domains_ = [] domains_ = []
for domain_name in domains.split(','): for domain_name in domains.split(','):
if domain_name in DOMAINS: if domain_name in DOMAINSDICT().keys():
domains_.append(domain_name) domains_.append(domain_name)
continue continue

2
halfapi/conf.py
View File

@ -10,7 +10,6 @@ It uses the following environment variables :
It defines the following globals : It defines the following globals :
- PROJECT_NAME (str) - PROJECT_NAME (str)
- DOMAINS ([]) - seems to be unused except in this file
- DOMAINSDICT ({domain_name: domain_module}) - DOMAINSDICT ({domain_name: domain_module})
- PRODUCTION (bool) - PRODUCTION (bool)
- BASE_DIR (str) - BASE_DIR (str)
@ -46,7 +45,6 @@ from .lib.domain import d_domains
logger = logging.getLogger('halfapi') logger = logging.getLogger('halfapi')
PROJECT_NAME = os.path.basename(os.getcwd()) PROJECT_NAME = os.path.basename(os.getcwd())
DOMAINS = []
DOMAINSDICT = lambda: {} DOMAINSDICT = lambda: {}
PRODUCTION = False PRODUCTION = False
HOST = '127.0.0.1' HOST = '127.0.0.1'