openstack
/
heat
Code Issues Proposed changes

Make number of workers configurable with apache 

This also adds the CustomLog directive to separately log
requests.

Change-Id: I7939e1a46f97a00f626cf282c9cba48208d9edea
Closes-Bug: #1656616
This commit is contained in:
rabi 2017-01-11 17:04:45 +05:30
parent 35935459da
commit e943d0874c
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devstack/files/apache-heat-api-cfn.template
View File

@ -1,7 +1,7 @@
Listen %PUBLICPORT% Listen %PUBLICPORT%
<VirtualHost *:%PUBLICPORT%> <VirtualHost *:%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 WSGIProcessGroup heat-api-cfn
WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cfn WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cfn
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
@ -10,7 +10,8 @@ Listen %PUBLICPORT%
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
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% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%

5
devstack/files/apache-heat-api-cloudwatch.template
View File

@ -1,7 +1,7 @@
Listen %PUBLICPORT% Listen %PUBLICPORT%
<VirtualHost *:%PUBLICPORT%> <VirtualHost *:%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 WSGIProcessGroup heat-api-cloudwatch
WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cloudwatch WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api-cloudwatch
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
@ -10,7 +10,8 @@ Listen %PUBLICPORT%
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
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% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%

5
devstack/files/apache-heat-api.template
View File

@ -1,7 +1,7 @@
Listen %PUBLICPORT% Listen %PUBLICPORT%
<VirtualHost *:%PUBLICPORT%> <VirtualHost *:%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 WSGIProcessGroup heat-api
WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api WSGIScriptAlias / %HEAT_BIN_DIR%/heat-wsgi-api
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
@ -10,7 +10,8 @@ Listen %PUBLICPORT%
<IfVersion >= 2.4> <IfVersion >= 2.4>
ErrorLogFormat "%{cu}t %M" ErrorLogFormat "%{cu}t %M"
</IfVersion> </IfVersion>
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% %SSLENGINE%
%SSLCERTFILE% %SSLCERTFILE%
%SSLKEYFILE% %SSLKEYFILE%

3
devstack/lib/heat
View File

@ -350,6 +350,7 @@ function _config_heat_apache_wsgi {
s|%PUBLICPORT%|$heat_api_port|g; s|%PUBLICPORT%|$heat_api_port|g;
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
s|%API_WORKERS%|$API_WORKERS|g;
s|%SSLENGINE%|$heat_ssl|g; s|%SSLENGINE%|$heat_ssl|g;
s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLCERTFILE%|$heat_certfile|g;
s|%SSLKEYFILE%|$heat_keyfile|g; s|%SSLKEYFILE%|$heat_keyfile|g;
@ -362,6 +363,7 @@ function _config_heat_apache_wsgi {
s|%PUBLICPORT%|$heat_cfn_api_port|g; s|%PUBLICPORT%|$heat_cfn_api_port|g;
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
s|%API_WORKERS%|$API_WORKERS|g;
s|%SSLENGINE%|$heat_ssl|g; s|%SSLENGINE%|$heat_ssl|g;
s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLCERTFILE%|$heat_certfile|g;
s|%SSLKEYFILE%|$heat_keyfile|g; s|%SSLKEYFILE%|$heat_keyfile|g;
@ -374,6 +376,7 @@ function _config_heat_apache_wsgi {
s|%PUBLICPORT%|$heat_cw_api_port|g; s|%PUBLICPORT%|$heat_cw_api_port|g;
s|%APACHE_NAME%|$APACHE_NAME|g; s|%APACHE_NAME%|$APACHE_NAME|g;
s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g; s|%HEAT_BIN_DIR%|$HEAT_BIN_DIR|g;
s|%API_WORKERS%|$API_WORKERS|g;
s|%SSLENGINE%|$heat_ssl|g; s|%SSLENGINE%|$heat_ssl|g;
s|%SSLCERTFILE%|$heat_certfile|g; s|%SSLCERTFILE%|$heat_certfile|g;
s|%SSLKEYFILE%|$heat_keyfile|g; s|%SSLKEYFILE%|$heat_keyfile|g;