wassname/openshift-celery-cartridge
1
0
Fork 0
mirror of https://github.com/wassname/openshift-celery-cartridge.git synced 2026-06-27 16:10:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Is Isilon
2015-04-21 09:28:46 +12:00
parent e5dcb571a6
commit 5659011623
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/control
+13 -20
View File
@@ -1,56 +1,49 @@
#!/bin/bash -e #!/bin/bash -e
source $OPENSHIFT_CARTRIDGE_SDK_BASH 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 . > ${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt
#echo $OPENSHIFT_PYTHON_DIR >> ${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt
#echo ${OPENSHIFT_CELERY_DIR} >> ${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt
#echo var >> ${OPENSHIFT_HOMEDIR}app-root/logs/celery_log.txt
#TODO add scaling, better status, variable worker names, stop workers properly
function start { function start {
LOGPIPE=${OPENSHIFT_HOMEDIR}/app-root/runtime/logshifter-python LOGPIPE=${OPENSHIFT_HOMEDIR}/app-root/runtime/logshifter-python
rm -f $LOGPIPE && mkfifo $LOGPIPE rm -f $LOGPIPE && mkfifo $LOGPIPE
/usr/bin/logshifter -tag python < $LOGPIPE & /usr/bin/logshifter -tag python < $LOGPIPE &
export PYTHONPATH=$OPENSHIFT_DATA_DIR:$OPENSHIFT_DATA_DIR/config/:$OPENSHIFT_REPO_DIR/.openshift:$OPENSHIFT_REPO_DIR/config:$OPENSHIFT_REPO_DIR/EXT:$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/config:$OPENSHIFT_REPO_DIR/EXT:$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/config:$OPENSHIFT_REPO_DIR/EXT:$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 "Starting Celery"
nohup ${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 &> $LOGPIPE & #echo "nohup nice -n 10 ${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 &> $LOGPIPE &" > ${OPENSHIFT_LOG_DIR}celery_log.txt
nohup nice -n 10 ${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_LOG_DIR}celery_log.txt &> $LOGPIPE &
if ps -p `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` > /dev/null; if ps -p `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` > /dev/null;
then then
echo "Starting celery worked" echo "Starting celery worked"
else else
echo "Startign celery failed" echo "Starting celery failed"
fi fi
} }
function stop { function stop {
celery multi stop worker --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid
if ps -p `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` > /dev/null; if ps -p `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` > /dev/null;
then then
kill -9 `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` kill -9 `cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid`
rm -f ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid
else else
echo "nothing to kill" echo "nothing to kill"
fi fi
echo "stopped" echo "stopped"
rm -f ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid
} }
function restart { function restart {
celery multi restart worker --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid celery multi restart worker --config=${OPENSHIFT_CELERY_CONFIG=celeryconfig} --loglevel=DEBUG --hostname=$OPENSHIFT_APP_DNS --pidfile=${OPENSHIFT_CELERY_DIR}etc/celeryd.pid --logfile=${OPENSHIFT_LOG_DIR}celery_log.txt
echo "not yet implemented" echo "Restarted celery"
} }
function status() { function status() {
pid=`cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid` pid=`cat ${OPENSHIFT_CELERY_DIR}etc/celeryd.pid`
info=`celery multi show worker` PROCESS_COUNT=$(ps -ef | grep "${PROCESS_NAME}" | grep -v "grep" | wc -l)
client_result $pwd client_result $pwd
if [ -f $pid ] && ( kill -0 $(cat $pid) ); then if [ -f $pid ] && ( kill -0 $(cat $pid) ); then
client_result "Celery is running ${info} at pid:${pid}" client_result "Celery is running at pid:${pid}, $PROCESS_COUNT instances of celery"
else else
client_result "Celery is not running" client_result "Celery is not running"
fi fi