Skip to content

Commit b0ef14f

Browse files
authored
Merge branch 'master' into dependabot/pip/django-5.1.7
2 parents 49e4eae + 5946461 commit b0ef14f

File tree

6 files changed

+8
-6
lines changed

6 files changed

+8
-6
lines changed

celery.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
2-
celery --app=editgroups.celery:app worker -B -l INFO
2+
celery --app=editgroups.celery:app worker --concurrency=1 --max-memory-per-child=50000 -B -l INFO
33

editgroups/settings/common.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@
220220
CELERY_BROKER_URL = BROKER_URL
221221
# We also use Redis as result backend.
222222
CELERY_RESULT_BACKEND = BROKER_URL
223-
CELERY_BROKER_TRANSPORT_OPTIONS = {'global_keyprefix': REDIS_KEY_PREFIX}
224223

225224
CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']
226225
CELERY_IMPORTS = ['revert.tasks', 'tagging.tasks' ]

editgroups/templates/editgroups/common.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<div id="footer">
5555
<a href="https://github.com/Wikidata/editgroups">Source on GitHub</a>
5656
<a href="{% url "api-list-batches" %}">API</a>
57-
<a href="https://www.wikidata.org/wiki/User_talk:Pintoch">Contact the author</a>
57+
<a href="https://www.wikidata.org/wiki/Wikidata_talk:Edit_groups">Help</a>
5858
</div>
5959
</body>
6060
</html>

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ django-bulk-update==2.2.0
44
django-redis-cache==3.0.1
55
django-cache-machine==1.2.0
66
djangorestframework==3.15.2
7-
django-filter==24.3
7+
django-filter==25.1
88
django-extensions==3.2.3
99
python-dateutil==2.9.0.post0
1010
pytz==2025.1

restart_celery.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
#!/bin/bash
22
export GOMAXPROCS=1
3-
kubectl delete deployment editgroups.celery.sh ; kubectl create -f /data/project/editgroups/www/python/src/deployment/celery.yaml && kubectl get pods
3+
kubectl delete deployment editgroups.celery.sh ;
4+
echo "Waiting for Celery to stop";
5+
sleep 45 ;
6+
kubectl create -f /data/project/editgroups/www/python/src/deployment/celery.yaml && kubectl get pods

tasks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else
1515
fi;
1616
echo "Starting celery"
1717
export C_FORCE_ROOT=True
18-
/data/project/editgroups/www/python/venv/bin/python3 /data/project/editgroups/www/python/venv/bin/celery --app=editgroups.celery:app worker -l INFO -B
18+
/data/project/editgroups/www/python/venv/bin/python3 /data/project/editgroups/www/python/venv/bin/celery --app=editgroups.celery:app worker -l INFO -B --concurrency=3 --max-memory-per-child=50000
1919
echo $?
2020
echo "Celery done"
2121

0 commit comments

Comments
 (0)