Commit ad74f65a authored by Jérome Perrin's avatar Jérome Perrin

stack/erp5: use runwsgi arguments for thread-amount and large-file-threshold

This needs a recent enough erp5, with the following commit:
zopewsgi: configure threads count and large_file_threshold with argparse
parent f5fbf2a6
...@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3 ...@@ -34,7 +34,7 @@ md5sum = 45cc45510b59ceb730b6e38448b5c0c3
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = 6af06cb86833065c9519cf413663e122 md5sum = ff6f8b04d0830b7914b3b9dae9c52f7b
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880 ...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = c66663d30154103786a48fe47dbaecdf md5sum = b366c477f4e5abdce7826c8ab639d83c
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -255,6 +255,8 @@ wrapped-command-line = ...@@ -255,6 +255,8 @@ wrapped-command-line =
{{ ipv4 }}:${:port} {{ ipv4 }}:${:port}
{% if timerserver_interval %}--timerserver-interval={{ timerserver_interval }}{% endif %} {% if timerserver_interval %}--timerserver-interval={{ timerserver_interval }}{% endif %}
'${:configuration-file}' '${:configuration-file}'
--threads={{ thread_amount }}
--large-file-threshold={{ slapparameter_dict['large-file-threshold'] }}
{% else -%} {% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %} {%- endif %}
...@@ -302,8 +304,6 @@ tidstorage-ip = {{ dumps(slapparameter_dict['tidstorage-ip']) }} ...@@ -302,8 +304,6 @@ tidstorage-ip = {{ dumps(slapparameter_dict['tidstorage-ip']) }}
tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }} tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
{% endif -%} {% endif -%}
{% set thread_amount = slapparameter_dict['thread-amount'] -%} {% set thread_amount = slapparameter_dict['thread-amount'] -%}
{% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%}
thread-amount = {{ thread_amount }}
webdav = {{ dumps(webdav) }} webdav = {{ dumps(webdav) }}
wsgi = {{ dumps(wsgi) }} wsgi = {{ dumps(wsgi) }}
timerserver-interval = {{ dumps(timerserver_interval) }} timerserver-interval = {{ dumps(timerserver_interval) }}
...@@ -349,7 +349,6 @@ node-id = {{ dumps(node_id_base ~ (node_id_index_format % index)) }} ...@@ -349,7 +349,6 @@ node-id = {{ dumps(node_id_base ~ (node_id_index_format % index)) }}
{% endfor -%} {% endfor -%}
import-list = {{ dumps(list(import_set)) }} import-list = {{ dumps(list(import_set)) }}
zodb-dict = {{ dumps(zodb_dict) }} zodb-dict = {{ dumps(zodb_dict) }}
large-file-threshold = {{ large_file_threshold }}
{% if longrequest_logger_interval > 0 -%} {% if longrequest_logger_interval > 0 -%}
longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }} longrequest-logger-file = {{ longrequest_logger_base_path ~ name ~ ".log" }}
longrequest-logger-timeout = {{ longrequest_logger_timeout }} longrequest-logger-timeout = {{ longrequest_logger_timeout }}
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
# too late for some components. # too late for some components.
%define INSTANCE {{ parameter_dict['instance'] }} %define INSTANCE {{ parameter_dict['instance'] }}
instancehome $INSTANCE instancehome $INSTANCE
zserver-threads {{ parameter_dict['thread-amount'] }}
# When ownership checking is enabled, the roles a script runs as are the # When ownership checking is enabled, the roles a script runs as are the
# intersection between user's roles and script owner's roles. This means # intersection between user's roles and script owner's roles. This means
# that revoking a code author's access to the system prevent all scripts # that revoking a code author's access to the system prevent all scripts
...@@ -65,10 +65,6 @@ trusted-proxy 0.0.0.0 ...@@ -65,10 +65,6 @@ trusted-proxy 0.0.0.0
{% endif -%} {% endif -%}
{% if 'large-file-threshold' in parameter_dict -%}
large-file-threshold {{ parameter_dict['large-file-threshold'] }}
{% endif -%}
{% if 'tidstorage-ip' in parameter_dict -%} {% if 'tidstorage-ip' in parameter_dict -%}
<product-config TIDStorage> <product-config TIDStorage>
backend-ip {{ parameter_dict['tidstorage-ip'] }} backend-ip {{ parameter_dict['tidstorage-ip'] }}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment