Commit 6c6bfdd5 authored by Jérome Perrin's avatar Jérome Perrin

ERP5: Start timerserver from wsgi script

Depends on nexedi/erp5!1529 and nexedi/erp5!1534

See merge request nexedi/slapos!1114
parents 18411537 c2411bca
...@@ -463,7 +463,6 @@ eggs = ${neoppod:eggs} ...@@ -463,7 +463,6 @@ eggs = ${neoppod:eggs}
requests requests
responses responses
threadframe threadframe
timerserver
urlnorm urlnorm
uuid uuid
xml_marshaller xml_marshaller
...@@ -708,7 +707,6 @@ spyne = 2.12.14 ...@@ -708,7 +707,6 @@ spyne = 2.12.14
suds = 0.4 suds = 0.4
facebook-sdk = 2.0.0 facebook-sdk = 2.0.0
threadframe = 0.2 threadframe = 0.2
timerserver = 2.0.4
urlnorm = 1.1.4 urlnorm = 1.1.4
uuid = 1.30 uuid = 1.30
validictory = 1.1.0 validictory = 1.1.0
......
...@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941 ...@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = 5ce9d5e99880d5db9ed339bbefe28d34 md5sum = 70f30111e137d158aeca3d67c4abf643
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
...@@ -86,7 +86,7 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936 ...@@ -86,7 +86,7 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 09895deebca3206425fada3caf1d92cf md5sum = 5520e81f1fff3dc26568a614b595da37
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -15,6 +15,11 @@ ...@@ -15,6 +15,11 @@
{% set test_runner_node_count = slapparameter_dict['test-runner-node-count'] -%} {% set test_runner_node_count = slapparameter_dict['test-runner-node-count'] -%}
{% set test_runner_random_activity_priority = slapparameter_dict['test-runner-random-activity-priority'] -%} {% set test_runner_random_activity_priority = slapparameter_dict['test-runner-random-activity-priority'] -%}
{% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%} {% set longrequest_logger_base_path = buildout_directory ~ '/var/log/longrequest_logger_' -%}
{% if webdav -%}
{% set timerserver_interval = 0 -%}
{% else -%}
{% set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
{%- endif %}
{% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%} {% macro section(name) %}{% do part_list.append(name) %}{{ name }}{% endmacro -%}
{% set bin_directory = parameter_dict['buildout-bin-directory'] -%} {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
{# {#
...@@ -221,7 +226,7 @@ pem = {{dumps(storage_dict.pop(k))}} ...@@ -221,7 +226,7 @@ pem = {{dumps(storage_dict.pop(k))}}
<= run-common <= run-common
instance-home = ${directory:instance} instance-home = ${directory:instance}
{% if wsgi -%} {% if wsgi -%}
wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${:port} '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runwsgi' {% if webdav %}-w{% endif %} {{ ipv4 }}:${:port} {% if timerserver_interval %}--timerserver-interval={{ timerserver_interval }}{% endif %} '${:configuration-file}'
{% else -%} {% else -%}
wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}' wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
{%- endif %} {%- endif %}
...@@ -279,11 +284,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }} ...@@ -279,11 +284,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
{% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%} {% set large_file_threshold = slapparameter_dict['large-file-threshold'] -%}
thread-amount = {{ thread_amount }} thread-amount = {{ thread_amount }}
webdav = {{ dumps(webdav) }} webdav = {{ dumps(webdav) }}
{% if webdav -%}
{% set timerserver_interval = 0 -%}
{% else -%}
{% set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
{%- endif %}
wsgi = {{ dumps(wsgi) }} wsgi = {{ dumps(wsgi) }}
timerserver-interval = {{ dumps(timerserver_interval) }} timerserver-interval = {{ dumps(timerserver_interval) }}
......
...@@ -78,16 +78,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }} ...@@ -78,16 +78,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
node-id {{ node_id }} node-id {{ node_id }}
</product-config> </product-config>
{% if not parameter_dict['wsgi'] -%}
{% set timerserver_interval = parameter_dict['timerserver-interval'] -%} {% set timerserver_interval = parameter_dict['timerserver-interval'] -%}
{% if timerserver_interval -%} {% if timerserver_interval -%}
{% if parameter_dict['wsgi'] -%}
%import Products.TimerService.timerserver %import Products.TimerService.timerserver
{% else %}
%import timerserver
{% endif -%}
<timer-server> <timer-server>
interval {{ timerserver_interval }} interval {{ timerserver_interval }}
</timer-server> </timer-server>
{% endif %}
{% endif -%} {% endif -%}
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%} {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
......
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