From e943d0874c8e8b690accd1ac303df4e745e8ffca Mon Sep 17 00:00:00 2001 From: rabi Date: Wed, 11 Jan 2017 17:04:45 +0530 Subject: [PATCH] Make number of workers configurable with apache This also adds the CustomLog directive to separately log requests. Change-Id: I7939e1a46f97a00f626cf282c9cba48208d9edea Closes-Bug: #1656616 --- devstack/files/apache-heat-api-cfn.template | 5 +++-- devstack/files/apache-heat-api-cloudwatch.template | 5 +++-- devstack/files/apache-heat-api.template | 5 +++-- devstack/lib/heat | 3 +++ 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/devstack/files/apache-heat-api-cfn.template b/devstack/files/apache-heat-api-cfn.template index ab33c66f7e..7cbca4a05f 100644 --- a/devstack/files/apache-heat-api-cfn.template +++ b/devstack/files/apache-heat-api-cfn.template @@ -1,7 +1,7 @@ Listen %PUBLICPORT% - WSGIDaemonProcess heat-api-cfn processes=2 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% + WSGIDaemonProcess heat-api-cfn processes=%API_WORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% WSGIProcessGroup heat-api-cfn WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cfn WSGIApplicationGroup %{GLOBAL} @@ -10,7 +10,8 @@ Listen %PUBLICPORT% = 2.4> ErrorLogFormat "%{cu}t %M" - ErrorLog /var/log/%APACHE_NAME%/heat-api-cfn.log + ErrorLog /var/log/%APACHE_NAME%/heat_api_cfn.log + CustomLog /var/log/%APACHE_NAME%/heat_api_cfn_access.log combined %SSLENGINE% %SSLCERTFILE% %SSLKEYFILE% diff --git a/devstack/files/apache-heat-api-cloudwatch.template b/devstack/files/apache-heat-api-cloudwatch.template index 06c91bbdb1..c86d9ee459 100644 --- a/devstack/files/apache-heat-api-cloudwatch.template +++ b/devstack/files/apache-heat-api-cloudwatch.template @@ -1,7 +1,7 @@ Listen %PUBLICPORT% - WSGIDaemonProcess heat-api-cloudwatch processes=2 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% + WSGIDaemonProcess heat-api-cloudwatch processes=%API_WORKERS% threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% WSGIProcessGroup heat-api-cloudwatch WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cloudwatch WSGIApplicationGroup %{GLOBAL} @@ -10,7 +10,8 @@ Listen %PUBLICPORT% = 2.4> ErrorLogFormat "%{cu}t %M" - ErrorLog /var/log/%APACHE_NAME%/heat-api-cloudwatch.log + ErrorLog /var/log/%APACHE_NAME%/heat_api_cloudwatch.log + CustomLog /var/log/%APACHE_NAME%/heat_api_cloudwatch_access.log combined %SSLENGINE% %SSLCERTFILE% %SSLKEYFILE% diff --git a/devstack/files/apache-heat-api.template b/devstack/files/apache-heat-api.template index 4924b3978b..01411be667 100644 --- a/devstack/files/apache-heat-api.template +++ b/devstack/files/apache-heat-api.template @@ -1,7 +1,7 @@ Listen %PUBLICPORT% - WSGIDaemonProcess heat-api processes=3 threads=1 user=%USER% display-name=%{GROUP} %VIRTUALENV% + WSGIDaemonProcess heat-api processes=%API_WORKERS% threads=10 user=%USER% display-name=%{GROUP} %VIRTUALENV% WSGIProcessGroup heat-api WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api WSGIApplicationGroup %{GLOBAL} @@ -10,7 +10,8 @@ Listen %PUBLICPORT% = 2.4> ErrorLogFormat "%{cu}t %M" - ErrorLog /var/log/%APACHE_NAME%/heat-api.log + ErrorLog /var/log/%APACHE_NAME%/heat_api.log + CustomLog /var/log/%APACHE_NAME%/heat_api_access.log combined %SSLENGINE% %SSLCERTFILE% %SSLKEYFILE% diff --git a/devstack/lib/heat b/devstack/lib/heat index c3bd16102c..fb781c3959 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -350,6 +350,7 @@ function _config_heat_apache_wsgi { s|%PUBLICPORT%|$heat_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; + s|%API_WORKERS%|$API_WORKERS|g; s|%SSLENGINE%|$heat_ssl|g; s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLKEYFILE%|$heat_keyfile|g; @@ -362,6 +363,7 @@ function _config_heat_apache_wsgi { s|%PUBLICPORT%|$heat_cfn_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; + s|%API_WORKERS%|$API_WORKERS|g; s|%SSLENGINE%|$heat_ssl|g; s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLKEYFILE%|$heat_keyfile|g; @@ -374,6 +376,7 @@ function _config_heat_apache_wsgi { s|%PUBLICPORT%|$heat_cw_api_port|g; s|%APACHE_NAME%|$APACHE_NAME|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; + s|%API_WORKERS%|$API_WORKERS|g; s|%SSLENGINE%|$heat_ssl|g; s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLKEYFILE%|$heat_keyfile|g;