diff options
Diffstat (limited to 'dev-python/celery/files')
-rw-r--r-- | dev-python/celery/files/celery-3.1.19-test.patch | 16 | ||||
-rw-r--r-- | dev-python/celery/files/celery-4.0.2-log-endless-loop.patch | 22 | ||||
-rw-r--r-- | dev-python/celery/files/celery-docs.patch | 19 | ||||
-rw-r--r-- | dev-python/celery/files/celery.confd-r2 | 51 | ||||
-rw-r--r-- | dev-python/celery/files/celery.initd-r2 | 205 |
5 files changed, 0 insertions, 313 deletions
diff --git a/dev-python/celery/files/celery-3.1.19-test.patch b/dev-python/celery/files/celery-3.1.19-test.patch deleted file mode 100644 index 25b41456a0ce..000000000000 --- a/dev-python/celery/files/celery-3.1.19-test.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/celery/celery/commit/fb48b1f357f7a416d1413d0056158a74191185af.diff -diff --git a/celery/tests/backends/test_mongodb.py b/celery/tests/backends/test_mongodb.py -index f7546d3..a32d9ed 100644 ---- a/celery/tests/backends/test_mongodb.py -+++ b/celery/tests/backends/test_mongodb.py -@@ -253,8 +253,8 @@ def test_restore_group(self, mock_get_database): - mock_collection.find_one.assert_called_once_with( - {'_id': sentinel.taskset_id}) - self.assertItemsEqual( -- ['date_done', 'result', 'task_id'], -- list(ret_val.keys()), -+ list(sorted(['date_done', 'result', 'task_id'])), -+ list(sorted(ret_val.keys())), - ) - - @patch('celery.backends.mongodb.MongoBackend._get_database') diff --git a/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch b/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch deleted file mode 100644 index bf9396e45a39..000000000000 --- a/dev-python/celery/files/celery-4.0.2-log-endless-loop.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 9c950b47eca2b4e93fd2fe52cf80f158e6cf97ad Mon Sep 17 00:00:00 2001 -From: George Psarakis <giwrgos.psarakis@gmail.com> -Date: Mon, 23 Jan 2017 11:49:38 +0200 -Subject: [PATCH] AWS DynamoDB result backend (#3736) - -* Fix endless loop in logger_isa (Python 3.6) - -https://github.com/celery/celery/pull/3736#issuecomment-274155454 - -diff --git a/celery/utils/log.py b/celery/utils/log.py -index 2fb15e6..00df476 100644 ---- a/celery/utils/log.py -+++ b/celery/utils/log.py -@@ -82,7 +82,7 @@ def logger_isa(l, p, max=1000): - else: - if this in seen: - raise RuntimeError( -- 'Logger {0!r} parents recursive'.format(l), -+ 'Logger {0!r} parents recursive'.format(l.name), - ) - seen.add(this) - this = this.parent diff --git a/dev-python/celery/files/celery-docs.patch b/dev-python/celery/files/celery-docs.patch deleted file mode 100644 index 5e09718feb2c..000000000000 --- a/dev-python/celery/files/celery-docs.patch +++ /dev/null @@ -1,19 +0,0 @@ -# Prevent un-needed objects.inv files -diff -ur celery-3.0.19.orig/docs/conf.py celery-3.0.19/docs/conf.py ---- docs/conf.py 2013-04-15 22:51:46.000000000 +0800 -+++ docs/conf.py 2013-04-27 21:46:25.070423582 +0800 -@@ -74,14 +74,6 @@ - # If true, '()' will be appended to :func: etc. cross-reference text. - add_function_parentheses = True - --intersphinx_mapping = { -- 'python': ('http://docs.python.org/dev', None), -- 'kombu': ('http://kombu.readthedocs.org/en/latest/', None), -- 'djcelery': ('http://django-celery.readthedocs.org/en/latest', None), -- 'cyme': ('http://cyme.readthedocs.org/en/latest', None), -- 'amqp': ('http://amqp.readthedocs.org/en/latest', None), --} -- - # The name of the Pygments (syntax highlighting) style to use. - pygments_style = 'colorful' - diff --git a/dev-python/celery/files/celery.confd-r2 b/dev-python/celery/files/celery.confd-r2 deleted file mode 100644 index d5ba2f7c9951..000000000000 --- a/dev-python/celery/files/celery.confd-r2 +++ /dev/null @@ -1,51 +0,0 @@ -# /etc/conf.d/celery - -############################################################################## -# GLOBAL CONFIGURATION - -# User and group -#CELERY_USER="celery" -#CELERY_GROUP="celery" - -# This is generaly a good idea to set the environment correctly -# because a lot of python package try to use HOME on init -#export HOME="/var/lib/myproject" - -# Full path to the python project directory. -#CELERY_PROJDIR="/var/lib/myproject" - -############################################################################## -# CELERYD - -# Start the Celery worker daemon -#CELERYD_ENABLED="yes" - -# celeryd notes -#CELERYD_NODES="celery" - -# celeryd options -# Example: set a 5 minute hard time limit for tasks, disable queue process prefetching and specify an app module from CELERY_PROJDIR -#CELERYD_OPTS="--time-limit=300 -Ofair -A celeryapp" - -# Location and level of the celeryd log file -#CELERYD_LOG_FILE=/var/log/celery/celeryd@%n.log -#CELERYD_LOG_LEVEL="INFO" - -# Location of the celeryd pid file -#CELERYD_PID_FILE=/run/celery/celeryd@%n.pid - -############################################################################## -# CELERYBEAT - -# Start the Celery task scheduler daemon -#CELERYBEAT_ENABLED="yes" - -# celerybeat options -#CELERYBEAT_OPTS="" - -# Location and level of the celerybeat log file -#CELERYBEAT_LOG_FILE=/var/log/celery/celerybeat.log -#CELERYBEAT_LOG_LEVEL="INFO" - -# Location of the celerybeat pid file -#CELERYBEAT_PID_FILE=/run/celery/celerybeat.pid diff --git a/dev-python/celery/files/celery.initd-r2 b/dev-python/celery/files/celery.initd-r2 deleted file mode 100644 index f34c136691b0..000000000000 --- a/dev-python/celery/files/celery.initd-r2 +++ /dev/null @@ -1,205 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the BSD license - -extra_started_commands="reload" - -depend() { - need net - use rabbitmq redis logger dns -} - -CELERYD_ENABLED=${CELERYD_ENABLED:-"no"} -CELERYD_PID_FILE=${CELERYD_PID_FILE:-"/run/celery/celeryd@%n.pid"} -CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-"/var/log/celery/celeryd@%n.log"} -CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-"INFO"} -CELERYD_NODES=${CELERYD_NODES:-"celery"} - -CELERYBEAT_ENABLED=${CELERYBEAT_ENABLED:-"no"} -CELERYBEAT_PID_FILE=${CELERYBEAT_PID_FILE:-"/run/celery/celerybeat.pid"} -CELERYBEAT_LOG_FILE=${CELERYBEAT_LOG_FILE:-"/var/log/celery/celerybeat.log"} -CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-"INFO"} - -export CELERY_LOADER - -CELERYD_MULTI=${CELERYD_MULTI:-"celery multi"} -CELERYCTL=${CELERYCTL:-"celery"} -CELERYBEAT=${CELERYBEAT:-"celery beat"} - -CELERYD_OPTS="${CELERYD_OPTS}" -CELERYBEAT_OPTS="${CELERYBEAT_OPTS} -f ${CELERYBEAT_LOG_FILE} -l ${CELERYBEAT_LOG_LEVEL}" - -create_dirs() { - local logfile="${1}" - local pidfile="${2}" - local logdir=$(dirname ${logfile}) - local piddir=$(dirname ${pidfile}) - - checkpath -d -q -m 0750 -o ${CELERY_USER:-"root"}:${CELERY_GROUP:-"root"} ${logdir} ${piddir} -} - -[ -n "${CELERY_USER}" ] && DAEMON_OPTS="${DAEMON_OPTS} --uid=${CELERY_USER}" -[ -n "${CELERY_GROUP}" ] && DAEMON_OPTS="${DAEMON_OPTS} --gid=${CELERY_GROUP}" - -checkconfig() { - if [ ! -c /dev/null ]; then - eerror "/dev/null is not a character device!" - return 1 - fi - - if [ -z "${CELERY_PROJDIR}" ]; then - eerror "Missing CELERY_PROJDIR variable" - return 1 - fi - - yesno "${CELERYD_ENABLED}" && \ - create_dirs "${CELERYD_LOG_FILE}" "${CELERYD_PID_FILE}" - - yesno "${CELERYBEAT_ENABLED}" && \ - create_dirs "${CELERYBEAT_LOG_FILE}" "${CELERYBEAT_PID_FILE}" - - return 0 -} - -celery_chdir() { - [ -n "${CELERY_PROJDIR}" ] && cd "${CELERY_PROJDIR}" -} - -wait_pid () { - local pidfile=${1} - local timeout=${STOPTIMEOUT:-"10"} - local PID=$(cat "${pidfile}" 2>/dev/null) - - while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do - kill -0 ${PID} 2>/dev/null || break - kill -TERM "${PID}" - timeout=$((${timeout} - 1)) - sleep 0.5 - done - - [ "${timeout}" -lt 1 ] && return 1 - [ -f ${pidfile} ] && rm -f ${pidfile} - return 0 -} - -# celeryd -start_workers() { - yesno "${CELERYD_ENABLED}" || return 0 - - ${CELERYD_MULTI} start ${CELERYD_NODES} ${DAEMON_OPTS} \ - --pidfile="${CELERYD_PID_FILE}" \ - --logfile="${CELERYD_LOG_FILE}" \ - --loglevel="${CELERYD_LOG_LEVEL}" \ - ${CELERYD_OPTS} -} - -stop_workers() { - yesno "${CELERYD_ENABLED}" || return 0 - - local timeout=${STOPTIMEOUT:-"10"} - - ${CELERYD_MULTI} stop ${CELERYD_NODES} --pidfile="${CELERYD_PID_FILE}" || return 1 - - # Wait for each node - for node in ${CELERYD_NODES}; do - local pidfile=${CELERYD_PID_FILE/\%n/${node}} - local PID=$(cat "${pidfile}" 2>/dev/null) - while [ -n "${PID}" ] && [ "${timeout}" -ge 1 ]; do - kill -0 ${PID} 2>/dev/null || break - timeout=$((${timeout} - 1)) - sleep 0.5 - done - done - - [ "${timeout}" -lt 1 ] && return 1 - return 0 -} - -restart_workers() { - yesno "${CELERYD_ENABLED}" || return 0 - - ${CELERYD_MULTI} restart ${CELERYD_NODES} ${DAEMON_OPTS} \ - --pidfile="${CELERYD_PID_FILE}" \ - --logfile="${CELERYD_LOG_FILE}" \ - --loglevel="${CELERYD_LOG_LEVEL}" \ - ${CELERYD_OPTS} -} - -# celerybeat -start_beat() { - yesno "${CELERYBEAT_ENABLED}" || return 0 - - ebegin "Starting celerybeat" - ${CELERYBEAT} ${CELERYBEAT_OPTS} ${DAEMON_OPTS} --detach \ - --pidfile="${CELERYBEAT_PID_FILE}" - eend ${?} -} - - -stop_beat() { - yesno "${CELERYBEAT_ENABLED}" || return 0 - - ebegin "Stopping celerybeat" - if [ -f "${CELERYBEAT_PID_FILE}" ]; then - wait_pid "${CELERYBEAT_PID_FILE}" - else - ewarn "not running" - fi - eend ${?} -} - - -start() { - local cr=0 - - checkconfig || return 1 - - ebegin "Starting ${SVCNAME}" - eindent - - celery_chdir && \ - start_workers && \ - start_beat || cr=1 - - eoutdent - eend ${cr} -} - -stop() { - local cr=0 - - checkconfig || return 1 - - ebegin "Stopping ${SVCNAME}" - eindent - - celery_chdir - stop_workers || cr=1 - stop_beat || cr=1 - - eoutdent - eend ${cr} -} - -reload() { - local cr=0 - - checkconfig || return 1 - - ebegin "Restarting ${SVCNAME}" - eindent - - celery_chdir - restart_workers || cr=1 - stop_beat && start_beat || cr=1 - - eoutdent - eend ${cr} -} - -status() { - checkconfig || return 1 - - celery_chdir && \ - ${CELERYCTL} status -} |