Wait at least 2 min until supervisor use SIGKILL signal. Flush openoffice...

Wait at least 2 min until supervisor use SIGKILL signal. Flush openoffice instances if pid is not present for oood.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34915 20353a03-c40f-0410-a6d1-a30d3c3de9de

buildout/profiles/deployment.cfg

@@ -21,7 +21,7 @@ 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) ${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

buildout/templates/oood-runserw.in

 #!/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.