opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve automatic uWSGI startup options interaction with [uwsgi] section

Browse Source 
in config file
This commit is contained in:
Nate Coraor
2017-08-28 15:18:09 -04:00
parent ea70bafa0c
commit 17ea3d671f
2 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/get_uwsgi_args.py
+33 -8
View File
@@ -12,21 +12,46 @@ from galaxy.config import (
parse_dependency_options,
)
from galaxy.script import main_factory
from galaxy.util.properties import nice_config_parser
DESCRIPTION = "Script to determine uWSGI command line arguments."
COMMAND_TEMPLATE = '{virtualenv}--ini-paste {galaxy_ini} --paste-logger --die-on-term --enable-threads{mule}{farm}'
COMMAND_TEMPLATE = '{virtualenv} --ini-paste {config_file}{processes}{threads}{http}{pythonpath}{master}{static-map}{paste-logger}{die-on-term}{enable-threads}{py-call-osafterfork}{mule}{farm}'
def _get_uwsgi_args(args, kwargs):
config_file = args.config_file or kwargs['__file__']
handlerct = int(kwargs.get('job_handler_count', 1))
pool_name = kwargs.get('job_handler_pool_name', 'job-handlers')
virtualenv = os.environ.get('VIRTUAL_ENV', None)
print(COMMAND_TEMPLATE.format(
virtualenv='--virtualenv %s ' % virtualenv if virtualenv else '',
galaxy_ini=args.config_file or kwargs['__file__'],
mule=' --py-call-osafterfork' + ' --mule=lib/galaxy/main.py' * handlerct if handlerct else '',
farm=' --farm=%s:%s' % (pool_name, ','.join([str(x) for x in range(1, handlerct + 1)]))))
config = nice_config_parser(config_file)
config_defaults = {
'virtualenv': ' --virtualenv {venv}'.format(venv=os.environ.get('VIRTUAL_ENV', './.venv')),
'processes': ' --processes 1',
'threads': ' --threads 4',
'http': ' --http localhost:8080',
'pythonpath': ' --pythonpath lib',
'master': ' --master',
'static-map': (' --static-map /static/style={here}/static/style/blue'
' --static-map /static={here}/static'.format(here=os.getcwd())),
'paste-logger': ' --paste-logger',
'die-on-term': ' --die-on-term',
'enable-threads': ' --enable-threads',
'py-call-osafterfork': ' --py-call-osafterfork',
'mule': ' --mule=lib/galaxy/main.py' * handlerct,
'farm': ' --farm={name}:{mules}'.format(
name=kwargs.get('job_handler_pool_name', 'job-handlers'),
mules=','.join([str(x) for x in range(1, handlerct + 1)])),
}
if not config.has_section('uwsgi'):
format_dict = config_defaults
else:
format_dict = {}
for opt in config_defaults.keys():
if config.has_option('uwsgi', opt):
format_dict[opt] = ''
else:
format_dict[opt] = config_defaults[opt]
format_dict['config_file'] = config_file
print(COMMAND_TEMPLATE.format(**format_dict))
ACTIONS = {