openstack/devstack
Code Issues Proposed changes

Merge "Cleanup duplication in keystone uwsgi options"

Browse Source
This commit is contained in:
Jenkins
2016-03-15 01:01:08 +00:00
committed by Gerrit Code Review
parent 44177fabc3 0d38e2d5d8
commit c47340efb7
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/keystone
View File

@@ -303,28 +303,22 @@ function configure_keystone {
fi fi
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-public" iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-public"
# This is running standalone
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi threads $(nproc) iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi threads $(nproc)
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi enable-threads true
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi plugins python
# uwsgi recommends this to prevent thundering herd on accept.
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi thunder-lock true
# Override the default size for headers from the 4k default.
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi buffer-size 65535
# Make sure the client doesn't try to re-use the connection.
iniset "$KEYSTONE_PUBLIC_UWSGI_FILE" uwsgi add-header "Connection: close"
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-admin" iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi wsgi-file "$KEYSTONE_BIN_DIR/keystone-wsgi-admin"
# This is running standalone
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi threads $API_WORKERS iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi threads $API_WORKERS
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi enable-threads true
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi plugins python # Common settings
# uwsgi recommends this to prevent thundering herd on accept. for file in "$KEYSTONE_PUBLIC_UWSGI_FILE" "$KEYSTONE_ADMIN_UWSGI_FILE"; do
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi thunder-lock true iniset "$file" uwsgi enable-threads true
# Override the default size for headers from the 4k default. iniset "$file" uwsgi plugins python
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi buffer-size 65535 # uwsgi recommends this to prevent thundering herd on accept.
# Make sure the client doesn't try to re-use the connection. iniset "$file" uwsgi thunder-lock true
iniset "$KEYSTONE_ADMIN_UWSGI_FILE" uwsgi add-header "Connection: close" # Override the default size for headers from the 4k default.
iniset "$file" uwsgi buffer-size 65535
# Make sure the client doesn't try to re-use the connection.
iniset "$file" uwsgi add-header "Connection: close"
done
else # eventlet else # eventlet
if is_ssl_enabled_service key; then if is_ssl_enabled_service key; then