Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cherry-pick the fix for lp bug 2021550 to xena branch #858

Merged
merged 3 commits into from
Nov 2, 2023
Merged

cherry-pick the fix for lp bug 2021550 to xena branch #858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffa078d
Allow users to disable wsgi socket rotation (#801)
zhhuabj Jul 5, 2023
57010d4
Rename wsgi-rotation to wsgi-socket-rotation
dosaboy Aug 5, 2023
0564dab
Fix pep8 error in assert type comparison
rodrigogansobarbieri Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions charmhelpers/contrib/openstack/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1674,6 +1674,9 @@ def __init__(self, name=None, script=None, admin_script=None,

def __call__(self):
total_processes = _calculate_workers()
enable_wsgi_socket_rotation = config('wsgi-socket-rotation')
if enable_wsgi_socket_rotation is None:
enable_wsgi_socket_rotation = True
ctxt = {
"service_name": self.service_name,
"user": self.user,
Expand All @@ -1687,6 +1690,7 @@ def __call__(self):
"public_processes": int(math.ceil(self.public_process_weight *
total_processes)),
"threads": 1,
"wsgi_socket_rotation": enable_wsgi_socket_rotation,
}
return ctxt

Expand Down
6 changes: 6 additions & 0 deletions charmhelpers/contrib/openstack/templates/wsgi-openstack-api.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ Listen {{ admin_port }}
Listen {{ public_port }}
{% endif -%}

{% if wsgi_socket_rotation -%}
WSGISocketRotation On
{% else -%}
WSGISocketRotation Off
{% endif -%}

{% if port -%}
<VirtualHost *:{{ port }}>
WSGIDaemonProcess {{ service_name }} processes={{ processes }} threads={{ threads }} user={{ user }} group={{ group }} \
Expand Down
2 changes: 1 addition & 1 deletion charmhelpers/fetch/snap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def _snap_exec(commands):
:param commands: List commands
:return: Integer exit code
"""
assert type(commands) == list
assert type(commands) is list

retry_count = 0
return_code = None
Expand Down
10 changes: 8 additions & 2 deletions tests/contrib/openstack/test_os_contexts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3295,7 +3295,9 @@ def test_loglevel_context_unset(self):
@patch.object(context, '_calculate_workers')
def test_wsgi_worker_config_context(self,
_calculate_workers):
self.config.return_value = 2 # worker-multiplier=2
self.config.side_effect = fake_config({
'worker-multiplier': 2, 'non-defined-wsgi-socket-rotation': True
})
_calculate_workers.return_value = 8
service_name = 'service-name'
script = '/usr/bin/script'
Expand All @@ -3312,13 +3314,16 @@ def test_wsgi_worker_config_context(self,
"admin_processes": 2,
"public_processes": 6,
"threads": 1,
"wsgi_socket_rotation": True,
}
self.assertEqual(expect, ctxt())

@patch.object(context, '_calculate_workers')
def test_wsgi_worker_config_context_user_and_group(self,
_calculate_workers):
self.config.return_value = 1
self.config.side_effect = fake_config({
'worker-multiplier': 1, 'wsgi-socket-rotation': False
})
_calculate_workers.return_value = 1
service_name = 'service-name'
script = '/usr/bin/script'
Expand All @@ -3339,6 +3344,7 @@ def test_wsgi_worker_config_context_user_and_group(self,
"admin_processes": 1,
"public_processes": 1,
"threads": 1,
"wsgi_socket_rotation": False,
}
self.assertEqual(expect, ctxt())

Expand Down
Loading