From 0925b9576adaa3224574dec867955e7faceb3a61 Mon Sep 17 00:00:00 2001
From: Is Isilon <wassname@wassname.org>
Date: Fri, 10 Apr 2015 14:33:14 +0800
Subject: [PATCH] trying to get it working on updated openshift

---
 bin/control | 23 ++++++++++++++++++-----
 usr/celery  |  7 +++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/bin/control b/bin/control
index 73e6dc4..76500f1 100755
--- a/bin/control
+++ b/bin/control
@@ -1,19 +1,19 @@
 #!/bin/bash -e
 
-PATH=/bin/:/usr/bin:$PATH
-
+PATH=${OPENSHIFT_CELERY_DIR}bin/:${OPENSHIFT_CELERY_DIR}usr/bin:$PATH
 #source $OPENSHIFT_CARTRIDGE_SDK_BASH
 
 function start {
     export PYTHONPATH=$OPENSHIFT_REPO_DIR/.openshift:$OPENSHIFT_REPO_DIR/wsgi:$OPENSHIFT_REPO_DIR:$PYTHONPATH
     echo "cartridge ready for code"
-#    echo "`echo $OPENSHIFT_CELERY_DIR`usr/celery worker start --pidfile=`echo $OPENSHIFT_CELERY_DIR`etc/celeryd.pid --loglevel=DEBUG --logfile=`echo $OPENSHIFT_TMP_DIR`celery_log.txt" >> `echo $OPENSHIFT_TMP_DIR`blarg.txt
+    echo "${OPENSHIFT_CELERY_DIR}usr/celery worker -A ${OPENSHIFT_CELERY_PYTHON_PKG_NAME} -b ${OPENSHIFT_CELERY_BROKER_URL} --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --loglevel=DEBUG --logfile=${OPENSHIFT_TMP_DIR}celery_log.txt" >> `echo $OPENSHIFT_TMP_DIR`blarg.txt
+    ${OPENSHIFT_CELERY_DIR}usr/celery multi start worker --app=${OPENSHIFT_CELERY_PYTHON_PKG_NAME} --broker=${OPENSHIFT_CELERY_BROKER_URL} --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --hostname=${OPENSHIFT_APP_DNS} --loglevel=DEBUG --logfile=${OPENSHIFT_TMP_DIR}celery_log.txt
 }
 
 function stop {
     if ps -p `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` > /dev/null; 
     then
-        kill `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid`
+        kill -9 `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid`
     else
         echo "nothing to kill"
     fi
@@ -21,10 +21,23 @@ function stop {
 }
 
 function restart {
-    echo "restarted"
+    celery multi restart worker --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid
+    echo "not yet implemented"
     
 }
 
+function status() {
+    pid=`cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid`
+    info=`celery multi show worker`
+    client_result $pwd
+    if [ -f $pid ] && ( kill -0 $(cat $pid) ); then
+        client_result "Celery is running ${info}"
+        client_result "  Connect to: $OPENSHIFT_GEAR_DNS:$OPENSHIFT_CELERY_IDENT"
+    else
+        client_result "Celery is not running"
+    fi
+}
+
 function catchall {
     echo "not yet implemented"
 }
diff --git a/usr/celery b/usr/celery
index ed4d988..de3cef9 100755
--- a/usr/celery
+++ b/usr/celery
@@ -1,8 +1,11 @@
 #!/usr/bin/env python2.7
 
-import os; activate_this=os.path.join(os.path.dirname('%svirtenv/bin/' % os.getenv('OPENSHIFT_PYTHON_DIR')), 'activate_this.py'); execfile(activate_this, dict(__file__=activate_this)); del os, activate_this
+import os
+activate_this=os.path.join(os.path.dirname('%svirtenv/bin/' % os.getenv('OPENSHIFT_PYTHON_DIR')), 'activate_this.py')
+execfile(activate_this, dict(__file__=activate_this))
+del os, activate_this
 
-# EASY-INSTALL-ENTRY-SCRIPT: 'celery==3.0.24','console_scripts','celery'
+# EASY-INSTALL-ENTRY-SCRIPT: 'celery','console_scripts','celery'
 __requires__ = 'celery'
 import sys
 from pkg_resources import load_entry_point