From 3b870133aa6d52b7885ccbb2742fc79ad971c89d Mon Sep 17 00:00:00 2001 From: jingrow Date: Tue, 23 Dec 2025 23:17:43 +0800 Subject: [PATCH] update FRAPPE to JINGROW --- deployment/supervisor.conf | 10 +++++----- press/docker/Dockerfile | 6 +++--- press/docker/Dockerfile_Bench_5_2_1 | 2 +- press/overrides.py | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deployment/supervisor.conf b/deployment/supervisor.conf index c1c7a4d0..1ba2402f 100644 --- a/deployment/supervisor.conf +++ b/deployment/supervisor.conf @@ -2,7 +2,7 @@ ; priority=1 --> Lower priorities indicate programs that start first and shut down last ; killasgroup=true --> send kill signal to child processes too [supervisord] -environment=PYTHONUNBUFFERED="1", SENTRY_DSN="https://0b59ca68d333c62aa1f4b4f47fc0b9e5@sentry.jingrow.cloud/2", FRAPPE_SENTRY_DSN="https://0b59ca68d333c62aa1f4b4f47fc0b9e5@sentry.jingrow.cloud/2", PATH="/home/jingrow/.local/bin:/home/jingrow/.nvm/versions/node/v18.17.1/bin:/home/jingrow/.pyenv/plugins/pyenv-virtualenv/shims:/home/jingrow/.pyenv/shims:/home/jingrow/.pyenv/bin::%(ENV_PATH)s", SENTRY_TRACING_SAMPLE_RATE="1", ENABLE_SENTRY_DB_MONITORING="1" +environment=PYTHONUNBUFFERED="1", SENTRY_DSN="https://0b59ca68d333c62aa1f4b4f47fc0b9e5@sentry.jingrow.cloud/2", JINGROW_SENTRY_DSN="https://0b59ca68d333c62aa1f4b4f47fc0b9e5@sentry.jingrow.cloud/2", PATH="/home/jingrow/.local/bin:/home/jingrow/.nvm/versions/node/v18.17.1/bin:/home/jingrow/.pyenv/plugins/pyenv-virtualenv/shims:/home/jingrow/.pyenv/shims:/home/jingrow/.pyenv/bin::%(ENV_PATH)s", SENTRY_TRACING_SAMPLE_RATE="1", ENABLE_SENTRY_DB_MONITORING="1" ; graceful timeout should always be lower than stopwaitsecs to avoid orphan gunicorn workers. [program:jingrow-bench-jingrow-web] @@ -38,7 +38,7 @@ user=jingrow stopwaitsecs=360 directory=/home/jingrow/jingrow-bench killasgroup=true -environment=FRAPPE_BACKGROUND_WORKERS_NOFORK="True" +environment=JINGROW_BACKGROUND_WORKERS_NOFORK="True" process_name=%(program_name)s [program:jingrow-bench-jingrow-short-worker] @@ -52,7 +52,7 @@ user=jingrow stopwaitsecs=360 directory=/home/jingrow/jingrow-bench killasgroup=true -environment=FRAPPE_BACKGROUND_WORKERS_NOFORK="True" +environment=JINGROW_BACKGROUND_WORKERS_NOFORK="True" process_name=%(program_name)s @@ -67,7 +67,7 @@ user=jingrow stopwaitsecs=1560 directory=/home/jingrow/jingrow-bench killasgroup=true -environment=FRAPPE_BACKGROUND_WORKERS_NOFORK="True" +environment=JINGROW_BACKGROUND_WORKERS_NOFORK="True" process_name=%(program_name)s @@ -82,7 +82,7 @@ user=jingrow stopwaitsecs=1560 directory=/home/jingrow/jingrow-bench killasgroup=true -environment=FRAPPE_BACKGROUND_WORKERS_NOFORK="True" +environment=JINGROW_BACKGROUND_WORKERS_NOFORK="True" process_name=%(program_name)s diff --git a/press/docker/Dockerfile b/press/docker/Dockerfile index ee808085..6e829ddd 100644 --- a/press/docker/Dockerfile +++ b/press/docker/Dockerfile @@ -1,7 +1,7 @@ # syntax = docker/dockerfile:experimental FROM ubuntu:22.04 -ENV FRAPPE_DOCKER_BUILD True +ENV JINGROW_DOCKER_BUILD True ENV LANG C.UTF-8 ENV DEBIAN_FRONTEND noninteractive @@ -280,8 +280,8 @@ RUN mkdir -p {{ m.destination }} && \ `#stage-mounts-create` {% endfor %} -ENV FRAPPE_DOCKER_BUILD= -ENV FRAPPE_HARD_LINK_ASSETS True +ENV JINGROW_DOCKER_BUILD= +ENV JINGROW_HARD_LINK_ASSETS True ENV HISTTIMEFORMAT "%Y-%m-%d %T " EXPOSE 8000 9000 2200 8088 diff --git a/press/docker/Dockerfile_Bench_5_2_1 b/press/docker/Dockerfile_Bench_5_2_1 index 296ed024..ed55c6f5 100644 --- a/press/docker/Dockerfile_Bench_5_2_1 +++ b/press/docker/Dockerfile_Bench_5_2_1 @@ -170,7 +170,7 @@ RUN --mount=type=cache,target=/home/jingrow/.cache,uid=1000,gid=1000 --mount=typ COPY --chown=jingrow:jingrow config /home/jingrow/jingrow-bench/config COPY --chown=jingrow:jingrow apps.txt /home/jingrow/jingrow-bench/sites/apps.txt -ENV FRAPPE_HARD_LINK_ASSETS True +ENV JINGROW_HARD_LINK_ASSETS True EXPOSE 8000 8088 9000 2200 CMD ["supervisord"] diff --git a/press/overrides.py b/press/overrides.py index fcaea86b..8bbcc05b 100644 --- a/press/overrides.py +++ b/press/overrides.py @@ -114,7 +114,7 @@ def cleanup_ansible_tmp_files(): threshold = time.time() - 60 * 60 # >One hour old - if os.environ.get("FRAPPE_BACKGROUND_WORKERS_NOFORK"): + if os.environ.get("JINGROW_BACKGROUND_WORKERS_NOFORK"): # Long running processes, don't cleanup threshold = time.time() - 2 * 24 * 60 * 60 # >2 days old