1

README.md

@@ -16,9 +16,9 @@ Configuration
 To install
 ---------------------
 
-    rhc cartridge-add https://raw.github.com/wassname/openshift-celery-cartridge/master/metadata/manifest.yml -a `<appname>`
+    rhc cartridge-add https://raw.github.com/wassname/openshift-celery-cartridge/master/metadata/manifest.yml -a "appname"
     
-Any log output will be generated to ${OPENSHIFT_HOMEDIR}logs/celery_log.txt and will be viewable with the rhc tail "appname" command
+Any log output will be generated to `${OPENSHIFT_HOMEDIR}logs/celery_log.txt` and will be viewable with the rhc tail "appname" command
 
 This was tested using:
 

bin/control

@@ -1,8 +1,13 @@
 #!/bin/bash -e
 
 source $OPENSHIFT_CARTRIDGE_SDK_BASH
-
+source $OPENSHIFT_PYTHON_DIRvirtenv/bin/activate
 PATH=$OPENSHIFT_DATA_DIR:$OPENSHIFT_DATA_DIR/config/:${OPENSHIFT_CELERY_DIR}bin/:${OPENSHIFT_CELERY_DIR}usr/bin:${OPENSHIFT_CELERY_DIR}conf.d:$PATH
+echo find .
+echo $OPENSHIFT_PYTHON_DIR
+echo ${OPENSHIFT_CELERY_DIR}
+echo var
+
 
 #TODO add scaling, better status, variable worker names, stop workers properly
 
@@ -10,7 +15,7 @@ function start {
 	export PYTHONPATH=$OPENSHIFT_DATA_DIR:$OPENSHIFT_DATA_DIR/config/:$OPENSHIFT_REPO_DIR/.openshift:$OPENSHIFT_REPO_DIR/wsgi::$OPENSHIFT_CELERY_DIR/conf.d:$OPENSHIFT_REPO_DIR:$PYTHONPATH
 	PYTHONPATH=$OPENSHIFT_DATA_DIR:$OPENSHIFT_DATA_DIR/config/:$OPENSHIFT_REPO_DIR/.openshift:$OPENSHIFT_REPO_DIR/wsgi::$OPENSHIFT_CELERY_DIR/conf.d:$OPENSHIFT_REPO_DIR:$PYTHONPATH
     echo  "Starting Celery, cmd: ${OPENSHIFT_CELERY_DIR}usr/celery multi start worker --config=${OPENSHIFT_CELERY_CONFIG=celeryconfig}  --loglevel=DEBUG --hostname=$OPENSHIFT_APP_DNS --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --logfile=${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt"
-    echo `${OPENSHIFT_CELERY_DIR}usr/celery multi start worker --config=${OPENSHIFT_CELERY_CONFIG=celeryconfig}  --loglevel=DEBUG --hostname=$OPENSHIFT_APP_DNS --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --logfile=${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt` >  ${OPENSHIFT_APP_ROOT}app-root/logs/celery_log.txt
+    #echo `${OPENSHIFT_CELERY_DIR}usr/celery multi start worker --config=${OPENSHIFT_CELERY_CONFIG=celeryconfig}  --loglevel=DEBUG --hostname=$OPENSHIFT_APP_DNS --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --logfile=${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt` >  ${OPENSHIFT_APP_ROOT}app-root/logs/celery_log.txt
     ${OPENSHIFT_CELERY_DIR}usr/celery multi start worker --config=${OPENSHIFT_CELERY_CONFIG=celeryconfig}  --loglevel=DEBUG --hostname=$OPENSHIFT_APP_DNS --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --logfile=${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt
 }
 
@@ -22,6 +27,7 @@ function stop {
         echo "nothing to kill"
     fi
     echo "stopped"
+    rm -f ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid
 }
 
 function restart {

metadata/manifest.yml

@@ -13,6 +13,7 @@ Source-Url: https://github.com/wassname/openshift-celery-cartridge.git
 Categories:
   - service
   - embedded
+  - python
 Requires: celery
 Scaling:
   Min: 1
@@ -38,11 +39,11 @@ Group-Overrides:
   - components:
     - celery
 Subscribes:
-  set-redis-connection-info:
+  set-rcelery-connection-info:
     Type: "ENV:NET_TCP:db:celery:connection-info-v1"
     Required: false
 Publishes:
   publish-db-connection-info:
     Type: "ENV:NET_TCP:db:connection-info"
-  publish-redis-connection-info:
+  publish-celery-connection-info:
     Type: "ENV:NET_TCP:db:celery:connection-info-v1"