From b0d60a80f5f7949cbf93d3f69d50062c1aafe1ec Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Tue, 13 Jul 2021 15:04:17 +0200 Subject: [PATCH] debian: add uwsgi spooler (#55566) --- debian/bijoe.dirs | 1 + debian/bijoe.init | 1 + debian/bijoe.postinst | 1 + debian/bijoe.service | 3 ++- debian/uwsgi.ini | 3 +++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/bijoe.dirs b/debian/bijoe.dirs index 2da0d79..4004fa8 100644 --- a/debian/bijoe.dirs +++ b/debian/bijoe.dirs @@ -1,5 +1,6 @@ /etc/bijoe /usr/lib/bijoe /var/lib/bijoe/collectstatic +/var/lib/bijoe/spooler /var/lib/bijoe/tenants /var/log/bijoe diff --git a/debian/bijoe.init b/debian/bijoe.init index 28c321b..cf4cc45 100644 --- a/debian/bijoe.init +++ b/debian/bijoe.init @@ -38,6 +38,7 @@ GROUP=$NAME DAEMON_ARGS=${DAEMON_ARGS:-"--pidfile=$PIDFILE --uid $USER --gid $GROUP --ini /etc/$NAME/uwsgi.ini +--spooler /var/lib/$NAME/spooler/ --daemonize /var/log/uwsgi.$NAME.log"} # Load the VERBOSE setting and other rcS variables diff --git a/debian/bijoe.postinst b/debian/bijoe.postinst index 906aae7..d3185d7 100644 --- a/debian/bijoe.postinst +++ b/debian/bijoe.postinst @@ -20,6 +20,7 @@ case "$1" in # ensure dirs ownership chown $USER:$GROUP /var/log/$NAME chown $USER:$GROUP /var/lib/$NAME/collectstatic + chown $USER:$GROUP /var/lib/$NAME/spooler chown $USER:$GROUP /var/lib/$NAME/tenants # create a secret file SECRET_FILE=$CONFIG_DIR/secret diff --git a/debian/bijoe.service b/debian/bijoe.service index 9149b62..5e0120e 100644 --- a/debian/bijoe.service +++ b/debian/bijoe.service @@ -10,7 +10,8 @@ User=%p Group=%p ExecStartPre=/usr/bin/bijoe-manage migrate_schemas --noinput --verbosity 1 ExecStartPre=/usr/bin/bijoe-manage collectstatic --noinput -ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini +ExecStartPre=/bin/mkdir -p /var/lib/bijoe/spooler/%m/ +ExecStart=/usr/bin/uwsgi --ini /etc/%p/uwsgi.ini --spooler /var/lib/bijoe/spooler/%m/ ExecReload=/bin/kill -HUP $MAINPID KillSignal=SIGQUIT TimeoutStartSec=0 diff --git a/debian/uwsgi.ini b/debian/uwsgi.ini index f1b6bc3..585641c 100644 --- a/debian/uwsgi.ini +++ b/debian/uwsgi.ini @@ -9,6 +9,9 @@ http-socket = /run/bijoe/bijoe.sock chmod-socket = 666 vacuum = true +spooler-processes = 3 +spooler-max-tasks = 20 + master = true processes = 5 harakiri = 120