ulysia/szurubooru
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix config.py

Browse source
This commit is contained in:
nothink 2018-07-26 01:38:51 +09:00
parent 113410fc2d
commit 0b1029251d
1 changed files with 32 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
server/szurubooru/config.py
View file

@ -16,35 +16,33 @@ def merge(left: Dict, right: Dict) -> Dict:
return left return left
def docker_config() -> Dict: # def docker_config() -> Dict:
if os.getenv('CI') == 'true': # for key in [
return {} # 'POSTGRES_USER',
for key in [ # 'POSTGRES_PASSWORD',
'POSTGRES_USER', # 'POSTGRES_HOST',
'POSTGRES_PASSWORD', # 'ESEARCH_HOST'
'POSTGRES_HOST', # ]:
'ESEARCH_HOST' # if not os.getenv(key, False):
]: # raise errors.ConfigError(f'Environment variable "{key}" not set')
if not os.getenv(key, False): # return {
raise errors.ConfigError(f'Environment variable "{key}" not set') # 'debug': True,
return { # 'show_sql': int(os.getenv('LOG_SQL', 0)),
'debug': True, # 'data_url': os.getenv('DATA_URL', '/data/'),
'show_sql': int(os.getenv('LOG_SQL', 0)), # 'data_dir': '/data/',
'data_url': os.getenv('DATA_URL', '/data/'), # 'database': 'postgres://%(user)s:%(pass)s@%(host)s:%(port)d/%(db)s' % {
'data_dir': '/data/', # 'user': os.getenv('POSTGRES_USER'),
'database': 'postgres://%(user)s:%(pass)s@%(host)s:%(port)d/%(db)s' % { # 'pass': os.getenv('POSTGRES_PASSWORD'),
'user': os.getenv('POSTGRES_USER'), # 'host': os.getenv('POSTGRES_HOST'),
'pass': os.getenv('POSTGRES_PASSWORD'), # 'port': int(os.getenv('POSTGRES_PORT', 5432)),
'host': os.getenv('POSTGRES_HOST'), # 'db': os.getenv('POSTGRES_DB', os.getenv('POSTGRES_USER'))
'port': int(os.getenv('POSTGRES_PORT', 5432)), # },
'db': os.getenv('POSTGRES_DB', os.getenv('POSTGRES_USER')) # 'elasticsearch': {
}, # 'host': os.getenv('ESEARCH_HOST'),
'elasticsearch': { # 'port': int(os.getenv('ESEARCH_PORT', 9200)),
'host': os.getenv('ESEARCH_HOST'), # 'index': os.getenv('ESEARCH_INDEX', 'szurubooru')
'port': int(os.getenv('ESEARCH_PORT', 9200)), # }
'index': os.getenv('ESEARCH_INDEX', 'szurubooru') # }
}
}
def read_config() -> Dict: def read_config() -> Dict:
@ -53,8 +51,11 @@ def read_config() -> Dict:
if os.path.exists('../config.yaml'): if os.path.exists('../config.yaml'):
with open('../config.yaml') as handle: with open('../config.yaml') as handle:
ret = merge(ret, yaml.load(handle.read())) ret = merge(ret, yaml.load(handle.read()))
if os.path.exists('/.dockerenv'): if os.getenv('CI') == 'true':
ret = merge(ret, docker_config()) print('CI')
# if os.path.exists('/.dockerenv'):
# ret = merge(ret, docker_config())
return ret return ret