[Erp5-report] r34915 rafael - in /erp5/trunk/buildout: profiles/ templates/

[nobody at svn.erp5.org]

Author: rafael
Date: Mon May  3 01:54:28 2010
New Revision: 34915

URL: http://svn.erp5.org?rev=34915&view=rev
Log:
Wait at least 2 min until supervisor use SIGKILL signal. Flush openoffice instances if pid is not present for oood.

Modified:
    erp5/trunk/buildout/profiles/deployment.cfg
    erp5/trunk/buildout/templates/oood-runserw.in

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=34915&r1=34914&r2=34915&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Mon May  3 01:54:28 2010
@@ -21,7 +21,7 @@
 [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) ${buildout:data-bin-directory}/pidproxy [ ${configuration:oood_pid} ${buildout:data-bin-directory}/oood-runserw --start ] ${buildout:etc-directory}
+  20 oood (autorestart=true stopsignal=TERM stopwaitsecs=120) ${buildout:data-bin-directory}/pidproxy [ ${configuration:oood_pid} ${buildout:data-bin-directory}/oood-runserw --start ] ${buildout:etc-directory}
 
 [software-links]
 recipe = plone.recipe.command

Modified: erp5/trunk/buildout/templates/oood-runserw.in
URL: http://svn.erp5.org/erp5/trunk/buildout/templates/oood-runserw.in?rev=34915&r1=34914&r2=34915&view=diff
==============================================================================
--- erp5/trunk/buildout/templates/oood-runserw.in [utf8] (original)
+++ erp5/trunk/buildout/templates/oood-runserw.in [utf8] Mon May  3 01:54:28 2010
@@ -1,4 +1,12 @@
 #!/bin/sh
+
+# Verify if there is another oood running and flush if not
+# This will stop previous open offices running in the past.
+if [ ! -f ${configuration:oood_pid}];
+then
+    PYTHONPATH=${configuration:openoffice_uno} ${configuration:openoffice_python} ${software_definition:oood_software}/start.py --flush > /dev/null 2>&1 /dev/null
+fi
+
 PYTHONPATH=${configuration:openoffice_uno} ${configuration:openoffice_python} ${software_definition:oood_software}/runserw.py $@
 
 # After the previous command finish (--start or --stop), call start.py flush, this prevents leave openoffice and xvfb running after stop.