ERP5: Start timerserver from wsgi script

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

See merge request nexedi/slapos!1114

stack/erp5/buildout.cfg

@@ -463,7 +463,6 @@ eggs = ${neoppod:eggs}
   requests
   responses
   threadframe
-  timerserver
   urlnorm
   uuid
   xml_marshaller
@@ -708,7 +707,6 @@ spyne = 2.12.14
 suds = 0.4
 facebook-sdk = 2.0.0
 threadframe = 0.2
-timerserver = 2.0.4
 urlnorm = 1.1.4
 uuid = 1.30
 validictory = 1.1.0

stack/erp5/buildout.hash.cfg

@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
 
 [template-zope-conf]
 filename = zope.conf.in
-md5sum = 5ce9d5e99880d5db9ed339bbefe28d34
+md5sum = 70f30111e137d158aeca3d67c4abf643
 
 [site-zcml]
 filename = site.zcml
@@ -86,7 +86,7 @@ md5sum = bc821f9f9696953b10a03ad7b59a1936
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 09895deebca3206425fada3caf1d92cf
+md5sum = 5520e81f1fff3dc26568a614b595da37
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-zope.cfg.in

@@ -15,6 +15,11 @@
 {% 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 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 -%}
 {% set bin_directory = parameter_dict['buildout-bin-directory'] -%}
 {#
@@ -221,7 +226,7 @@ pem = {{dumps(storage_dict.pop(k))}}
 <= run-common
 instance-home = ${directory:instance}
 {% 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 -%}
 wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
 {%- endif %}
@@ -279,11 +284,6 @@ tidstorage-port = {{ dumps(slapparameter_dict['tidstorage-port']) }}
 {% set large_file_threshold = slapparameter_dict['large-file-threshold']  -%}
 thread-amount = {{ thread_amount }}
 webdav = {{ dumps(webdav) }}
-{% if webdav -%}
-{%   set timerserver_interval = 0 -%}
-{% else -%}
-{%   set timerserver_interval = slapparameter_dict['timerserver-interval'] -%}
-{%- endif %}
 wsgi = {{ dumps(wsgi) }}
 timerserver-interval = {{ dumps(timerserver_interval) }}
 

stack/erp5/zope.conf.in

@@ -78,16 +78,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
   node-id {{ node_id }}
 </product-config>
 
-{% set timerserver_interval = parameter_dict['timerserver-interval'] -%}
-{% if timerserver_interval -%}
-{%   if parameter_dict['wsgi'] -%}
+{% if not parameter_dict['wsgi'] -%}
+{%   set timerserver_interval = parameter_dict['timerserver-interval'] -%}
+{%   if timerserver_interval -%}
 %import Products.TimerService.timerserver
-{%   else %}
-%import timerserver
-{%   endif -%}
 <timer-server>
   interval {{ timerserver_interval }}
 </timer-server>
+{%   endif %}
 
 {% endif -%}
 {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}