[Erp5-report] r37676 gabriel - in /erp5/trunk/utils/erp5.recipe.cloudoooinstance: ./ src/er...

[nobody at svn.erp5.org]

Author: gabriel
Date: Tue Aug 10 17:22:19 2010
New Revision: 37676

URL: http://svn.erp5.org?rev=37676&view=rev
Log:
add cloudoooctl to be possible control the server and refactor recipe to install this script in buildout/bin

Added:
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in   (with props)
Modified:
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/setup.py
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py
    erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in

Modified: erp5/trunk/utils/erp5.recipe.cloudoooinstance/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/setup.py?rev=37676&r1=37675&r2=37676&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/setup.py [utf8] Tue Aug 10 17:22:19 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = "erp5.recipe.cloudoooinstance"
-version = '0.0.1'
+version = '0.0.2'
 
 setup(
     name = name,

Modified: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py?rev=37676&r1=37675&r2=37676&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/__init__.py [utf8] Tue Aug 10 17:22:19 2010
@@ -2,17 +2,23 @@ from os import path, chmod
 import logging
 import z3c.recipe.template as z3c_template
 
-class Recipe(z3c_template.Recipe):
+class Recipe(object):
   __module__ = __name__
 
   def __init__(self, buildout, name, options):
+    options['output'] = options['conf-output']
     options['input'] = path.join(path.abspath(path.dirname(__file__)), 
                                   "cloudooo.conf.in" )
-    z3c_template.Recipe.__init__(self, buildout, name, options)
+    self.conf_template = z3c_template.Recipe(buildout, name, options)
+    options['input'] = path.join(path.abspath(path.dirname(__file__)), 
+                                  "cloudoooctl.in" )
+    options['output'] = options['ctl-output']
+    self.ctl_template = z3c_template.Recipe(buildout, name, options)
 
   def install(self):
-    z3c_template.Recipe.install(self)
-    chmod(self.output, 0755)
+    self.conf_template.install()
+    self.ctl_template.install()
+    chmod(self.ctl_template.output, 0755)
     return []
 
   update = install

Modified: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in?rev=37676&r1=37675&r2=37676&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudooo.conf.in [utf8] Tue Aug 10 17:22:19 2010
@@ -1,4 +1,3 @@
-#!${buildout:bin-directory}/paster
 [app:main]
 use = egg:cloudooo
 #
@@ -59,11 +58,3 @@ python_path = ${python-path}
 use = egg:PasteScript#wsgiutils
 host = ${server-hostname}
 port = ${server-port}
-
-[exe]
-command = serve
-daemon = true
-user = ${user}
-group = ${group}
-log-file = ${buildout:log-directory}/cloudooo.log
-pid-file = ${buildout:run-directory}/cloudooo.pid

Added: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in?rev=37676&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in (added)
+++ erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in [utf8] Tue Aug 10 17:22:19 2010
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+cloudooo_CONFIG_FILE="${:conf-output}"
+
+cloudooo_LOG_DIRECTORY="${buildout:log-directory}"
+
+PID="${buildout:run-directory}/cloudooo.pid"
+
+PASTER_PATH="${buildout:bin-directory}/paster"
+
+start() {
+  $PASTER_PATH serve $cloudooo_CONFIG_FILE --daemon \
+  --log-file=$cloudooo_LOG_DIRECTORY/cloudooo.log \
+  --pid-file=$PID;
+}
+
+stop() {
+  if [ -f $PID ];
+  then
+      kill -1 `cat $PID`;
+      $PASTER_PATH serve $cloudooo_CONFIG_FILE --stop-daemon \
+      --pid-file=$PID;
+  fi
+}
+status(){
+  $PASTER_PATH serve $cloudooo_CONFIG_FILE --status \
+  --pid-file=$PID;
+}
+
+case "$1" in
+  start)
+    start;;
+  stop)
+    stop;;
+  status)
+    status;;
+  restart)
+    stop;
+    start;;
+  *)
+  echo "Usage: ./cloudoooctl {start|stop|restart|status}"
+  exit 1;;
+esac
+exit

Propchange: erp5/trunk/utils/erp5.recipe.cloudoooinstance/src/erp5/recipe/cloudoooinstance/cloudoooctl.in
------------------------------------------------------------------------------
    svn:executable = *