mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
gunicorn - minor refactoring (#3092)
* minor refactoring in gunicorn module * added changelog fragment * reworked the gunicorn bin path part of the code, per PR * Update changelogs/fragments/3092-gunicorn-refactor.yaml Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
0b70b3baff
commit
549dfaae64
2 changed files with 9 additions and 12 deletions
2
changelogs/fragments/3092-gunicorn-refactor.yaml
Normal file
2
changelogs/fragments/3092-gunicorn-refactor.yaml
Normal file
|
@ -0,0 +1,2 @@
|
|||
minor_changes:
|
||||
- gunicorn - search for ``gunicorn`` binary in more paths (https://github.com/ansible-collections/community.general/pull/3092).
|
|
@ -101,14 +101,12 @@ gunicorn:
|
|||
import os
|
||||
import time
|
||||
|
||||
# import ansible utils
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
|
||||
|
||||
def search_existing_config(config, option):
|
||||
''' search in config file for specified option '''
|
||||
if config and os.path.isfile(config):
|
||||
data_config = None
|
||||
with open(config, 'r') as f:
|
||||
for line in f:
|
||||
if option in line:
|
||||
|
@ -135,15 +133,12 @@ def main():
|
|||
module = AnsibleModule(
|
||||
argument_spec=dict(
|
||||
app=dict(required=True, type='str', aliases=['name']),
|
||||
venv=dict(required=False, type='path', default=None, aliases=['virtualenv']),
|
||||
config=dict(required=False, default=None, type='path', aliases=['conf']),
|
||||
chdir=dict(required=False, type='path', default=None),
|
||||
pid=dict(required=False, type='path', default=None),
|
||||
user=dict(required=False, type='str'),
|
||||
worker=dict(required=False,
|
||||
type='str',
|
||||
choices=['sync', 'eventlet', 'gevent', 'tornado ', 'gthread', 'gaiohttp']
|
||||
),
|
||||
venv=dict(type='path', aliases=['virtualenv']),
|
||||
config=dict(type='path', aliases=['conf']),
|
||||
chdir=dict(type='path'),
|
||||
pid=dict(type='path'),
|
||||
user=dict(type='str'),
|
||||
worker=dict(type='str', choices=['sync', 'eventlet', 'gevent', 'tornado ', 'gthread', 'gaiohttp']),
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -165,7 +160,7 @@ def main():
|
|||
if venv:
|
||||
gunicorn_command = "/".join((venv, 'bin', 'gunicorn'))
|
||||
else:
|
||||
gunicorn_command = 'gunicorn'
|
||||
gunicorn_command = module.get_bin_path('gunicorn')
|
||||
|
||||
# to daemonize the process
|
||||
options = ["-D"]
|
||||
|
|
Loading…
Reference in a new issue