2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

moved languages config to locale group

Browse source
This commit is contained in:
Jenny Danzmayr 2024-09-18 01:37:51 +02:00
parent afacd7b9c4
commit e0e38ff699
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
docker/entrypoint.sh
View file

@ -7,6 +7,7 @@ cd /app
# number of workers for guicorn, we coppy the value of UWSGI_WORKERS if it is not set # number of workers for guicorn, we coppy the value of UWSGI_WORKERS if it is not set
export WEB_CONCURRENCY="${WEB_CONCURRENCY:-$UWSGI_WORKERS}" export WEB_CONCURRENCY="${WEB_CONCURRENCY:-$UWSGI_WORKERS}"
export PROMETHEUS_MULTIPROC_DIR="/tmp/prometheus_multiproc"
automigrate() { automigrate() {
AUTOMIGRATE="${C3NAV_AUTOMIGRATE:no}" AUTOMIGRATE="${C3NAV_AUTOMIGRATE:no}"
@ -16,9 +17,15 @@ automigrate() {
fi fi
} }
setup_prometheus_multiproc() {
rm -rf "${PROMETHEUS_MULTIPROC_DIR}" || true
mkdir "PROMETHEUS_MULTIPROC_DIR"
}
case "$1" in case "$1" in
web) web)
automigrate automigrate
setup_prometheus_multiproc
exec /app/env/bin/uwsgi --master \ exec /app/env/bin/uwsgi --master \
--wsgi "c3nav.wsgi" \ --wsgi "c3nav.wsgi" \
--pythonpath "/app/src" \ --pythonpath "/app/src" \
@ -29,6 +36,7 @@ web)
;; ;;
webstatic) webstatic)
automigrate automigrate
setup_prometheus_multiproc
exec /app/env/bin/uwsgi --master \ exec /app/env/bin/uwsgi --master \
--wsgi "c3nav.wsgi" \ --wsgi "c3nav.wsgi" \
--pythonpath "/app" \ --pythonpath "/app" \
@ -41,13 +49,16 @@ webstatic)
;; ;;
web-async) web-async)
automigrate automigrate
setup_prometheus_multiproc
exec daphne -b 0.0.0.0 -p 8000 --no-server-name ${*:2} c3nav.asgi:application exec daphne -b 0.0.0.0 -p 8000 --no-server-name ${*:2} c3nav.asgi:application
;; ;;
webstatic-async) webstatic-async)
automigrate automigrate
setup_prometheus_multiproc
exec daphne -b 0.0.0.0 -p 8000 --no-server-name ${*:2} c3nav.asgi:static_app exec daphne -b 0.0.0.0 -p 8000 --no-server-name ${*:2} c3nav.asgi:static_app
;; ;;
worker) worker)
setup_prometheus_multiproc
exec celery -A c3nav worker --max-tasks-per-child 300 --concurrency 2 -l INFO -E exec celery -A c3nav worker --max-tasks-per-child 300 --concurrency 2 -l INFO -E
;; ;;
worker_healthcheck) worker_healthcheck)

3
src/c3nav/settings.py
View file

@ -465,7 +465,8 @@ EXTRA_LANG_INFO = {
LANG_INFO = dict(django.conf.locale.LANG_INFO, **EXTRA_LANG_INFO) LANG_INFO = dict(django.conf.locale.LANG_INFO, **EXTRA_LANG_INFO)
django.conf.locale.LANG_INFO = LANG_INFO django.conf.locale.LANG_INFO = LANG_INFO
SELECTED_LANGUAGES = frozenset(config.getlist('c3nav', 'languages', fallback='en,de')) SELECTED_LANGUAGES = frozenset(config.getlist('locale', 'languages', fallback='en,de',
env='C3NAV_LANGUAGES'))
LANGUAGES = [(code, name) for code, name in [ LANGUAGES = [(code, name) for code, name in [
('en', _('English')), ('en', _('English')),
('en-UW', _('Engwish UwU')), ('en-UW', _('Engwish UwU')),