[Erp5-report] r41801 arnaud.fontaine - in /erp5/trunk/buildout: instance-profiles/ profiles/
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Dec 27 16:10:07 CET 2010
Author: arnaud.fontaine
Date: Mon Dec 27 16:10:06 2010
New Revision: 41801
URL: http://svn.erp5.org?rev=41801&view=rev
Log:
Use erp5.extension.sectionextender to support properly supervisor
programs, namely only supervisor programs in sections added to parts
will actually be in supervisord.conf.
Previously, loading a .cfg specifying a supervisor programs would
add it to supervisord.conf even if it was not in parts and it was not
easily extendable neither.
Modified:
erp5/trunk/buildout/instance-profiles/cloudooo.cfg
erp5/trunk/buildout/instance-profiles/memcached.cfg
erp5/trunk/buildout/instance-profiles/mysql.cfg
erp5/trunk/buildout/instance-profiles/oood.cfg
erp5/trunk/buildout/instance-profiles/sphinx.cfg
erp5/trunk/buildout/instance-profiles/supervisor.cfg
erp5/trunk/buildout/profiles/deployment-2.12.cfg
erp5/trunk/buildout/profiles/deployment.cfg
erp5/trunk/buildout/profiles/software-common.cfg
Modified: erp5/trunk/buildout/instance-profiles/cloudooo.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/cloudooo.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/cloudooo.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -57,11 +57,10 @@ virtual-display-id = 77
virtual-screen = 0
server-hostname = 0.0.0.0
server-port = 8011
+supervisor-priority = 30
+supervisor-program =
+ ${:supervisor-priority} ${:_buildout_section_name_} (stopsignal=HUP) ${buildout:bin-directory}/paster [serve ${cloudooo-instance:conf-output}]
# this name is only for backward compatibility
[cloudooo-instance-template]
<= cloudooo-instance
-
-[configuration]
-supervisor_programs +=
- 30 cloudooo (stopsignal=HUP) ${buildout:bin-directory}/paster [serve ${cloudooo-instance:conf-output}]
Modified: erp5/trunk/buildout/instance-profiles/memcached.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/memcached.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/memcached.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/memcached.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -11,7 +11,9 @@ memcached_software_bin = ${software_defi
memcached_bin_folder = ${buildout:data-bin-directory}
memcached_conf_file = ${buildout:etc-directory}/memcached.conf
instancehome = ${buildout:var-directory}/memcached
-
+supervisor-priority = 20
+supervisor-program =
+ ${:supervisor-priority} ${:_buildout_section_name_} (autorestart=true) ${:memcached_bin_folder}/memcached
### JPS : Problem : promise-based config : We don't know if goal is reached
### + don't crush everything each time if nothing changed
@@ -40,7 +42,3 @@ memcached_factor = 1.25
memcached_key_size = 48
# -t
memcached_threads = 4
-
-[configuration]
-supervisor_programs +=
- 20 memcached (autorestart=true) ${memcached-instance:memcached_bin_folder}/memcached
Modified: erp5/trunk/buildout/instance-profiles/mysql.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/mysql.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/mysql.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -36,10 +36,9 @@ mysql_slow_query_time = 5
# Add some extra configuration to mysqld part in my.cnf
mysqld-extra-configuration =
+supervisor-priority = 10
+supervisor-program =
+ ${:supervisor-priority} ${:_buildout_section_name_} (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]
[mysql-server-template]
<= mysql-instance
-
-[configuration]
-supervisor_programs +=
- 10 mysql (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]
Modified: erp5/trunk/buildout/instance-profiles/oood.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/oood.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/oood.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -10,6 +10,9 @@ oood_conf_file = ${buildout:etc-director
wrapper_part = oood-wrapper
configuration_part = oood-configuration
+supervisor-priority = 20
+supervisor-program =
+ ${:supervisor-priority} ${:_buildout_section_name_} (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}
[oood-wrapper]
openoffice_python = ${software_definition:openoffice_software}/program/python
@@ -44,7 +47,3 @@ update-command = ${:command}
[conversion-server-template]
<= oood-instance
-
-[configuration]
-supervisor_programs +=
- 20 oood (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}
Modified: erp5/trunk/buildout/instance-profiles/sphinx.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/sphinx.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/sphinx.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/sphinx.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -25,3 +25,8 @@ sphinx_conf_file = ${buildout:etc-direct
sphinx_address = ${configuration:sphinx_address}
sphinx_port = ${configuration:sphinx_port}
sphinx_sql_port = ${configuration:sphinx_sql_port}
+
+supervisor-priority = 30
+supervisor-program =
+ ${:supervisor-priority} ${:_buildout_section_name_} (autorestart=true stopsignal=TERM) ${buildout:data-bin-directory}/searchd [ --nodetach ]
+
Modified: erp5/trunk/buildout/instance-profiles/supervisor.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/instance-profiles/supervisor.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/instance-profiles/supervisor.cfg [utf8] (original)
+++ erp5/trunk/buildout/instance-profiles/supervisor.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -2,6 +2,10 @@
parts =
supervisor-instance
+supervisor-section-extender-target-section = supervisor
+supervisor-section-extender-target-option = programs
+supervisor-section-extender-source-option = supervisor-program
+
[configuration]
supervisor_port = 9001
supervisor_host = 127.0.0.1
@@ -28,5 +32,4 @@ depends = ${pidproxy:recipe}
recipe = collective.recipe.supervisor
serverurl = http://${configuration:supervisor_host}:${configuration:supervisor_port}
pp = ${buildout:directory}/eggs/supervisor-3.0a7-py2.5.egg/supervisor/pidproxy.py
-programs = ${configuration:supervisor_programs}
port = ${configuration:supervisor_host}:${configuration:supervisor_port}
Modified: erp5/trunk/buildout/profiles/deployment-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment-2.12.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment-2.12.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -29,6 +29,8 @@ parts =
versions = versions
+extensions += erp5.extension.sectionextender
+
[eggs]
recipe = zc.recipe.egg
scripts =
Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -28,11 +28,7 @@ parts =
versions = versions
-[configuration]
-supervisor_programs =
- 10 mysql (autorestart=true) ${buildout:data-bin-directory}/pidproxy [ ${configuration:mysql_pid} ${buildout:data-bin-directory}/mysqld_safe ]
- 20 oood (autorestart=true stopsignal=TERM stopwaitsecs=30) ${buildout:data-bin-directory}/oood-runserw ${buildout:etc-directory}
- 30 sphinx (autorestart=true stopsignal=TERM) ${buildout:data-bin-directory}/searchd [ --nodetach ]
+extensions += erp5.extension.sectionextender
[software-links]
recipe = plone.recipe.command
Modified: erp5/trunk/buildout/profiles/software-common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/software-common.cfg?rev=41801&r1=41800&r2=41801&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/software-common.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/software-common.cfg [utf8] Mon Dec 27 16:10:06 2010
@@ -28,6 +28,7 @@ eggs =
erp5.recipe.sphinxserver
erp5.recipe.testrunner
erp5.recipe.zope2instance
+ erp5.extension.sectionextender
plone.recipe.command
supervisor
z3c.recipe.mkdir
More information about the Erp5-report
mailing list