wait #6995 @2

diff --git a/.docker/config/supervisor/conf.d/default-worker.conf b/.docker/config/supervisor/conf.d/default-worker.conf
new file mode 100644 (file)
index 0000000..5cfe635
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/default-worker.conf
@@ -0,0 +1,11 @@
+[program:default-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=/usr/bin/php /application/artisan queue:work --queue=default --timeout=3600000 --memory=12000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=4
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/conf.d/download-worker.conf b/.docker/config/supervisor/conf.d/download-worker.conf
new file mode 100644 (file)
index 0000000..39c2f54
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/download-worker.conf
@@ -0,0 +1,11 @@
+[program:download-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=/usr/bin/php /application/artisan queue:work --queue=download --timeout=3600000 --memory=12000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=4
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/conf.d/fluidbook-process-worker.conf b/.docker/config/supervisor/conf.d/fluidbook-process-worker.conf
new file mode 100644 (file)
index 0000000..0cbb72e
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/fluidbook-process-worker.conf
@@ -0,0 +1,11 @@
+[program:fluidbook-process-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=/usr/bin/php /application/artisan queue:work --queue=fluidbookprocess --timeout=3600000 --memory=12000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=48
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/conf.d/medialibrary-worker.conf b/.docker/config/supervisor/conf.d/medialibrary-worker.conf
new file mode 100644 (file)
index 0000000..2f947f0
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/medialibrary-worker.conf
@@ -0,0 +1,11 @@
+[program:medialibrary-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=/usr/bin/php /application/artisan queue:work --queue=medialibrary --timeout=3600000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=12
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/conf.d/theme-worker.conf b/.docker/config/supervisor/conf.d/theme-worker.conf
new file mode 100644 (file)
index 0000000..b2aa670
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/theme-worker.conf
@@ -0,0 +1,11 @@
+[program:theme-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=php /application/artisan queue:work --queue=theme --timeout=3600000 --memory=12000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=4
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/conf.d/ws2-worker.conf b/.docker/config/supervisor/conf.d/ws2-worker.conf
new file mode 100644 (file)
index 0000000..0beb444
--- /dev/null
+++ b/.docker/config/supervisor/conf.d/ws2-worker.conf
@@ -0,0 +1,11 @@
+[program:ws2-worker]
+process_name=%(program_name)s_%(process_num)02d
+command=/usr/bin/php /application/artisan queue:work --queue=ws2 --timeout=3600000 --memory=12000
+autostart=true
+autorestart=true
+user=toolbox
+group=www-data
+numprocs=6
+redirect_stderr=true
+stdout_logfile=/proc/self/fd/2
+stopwaitsecs=3600

diff --git a/.docker/config/supervisor/default-worker.conf b/.docker/config/supervisor/default-worker.conf
deleted file mode 100644 (file)
index 5cfe635..0000000
--- a/.docker/config/supervisor/default-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:default-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=default --timeout=3600000 --memory=12000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=4
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/config/supervisor/download-worker.conf b/.docker/config/supervisor/download-worker.conf
deleted file mode 100644 (file)
index 39c2f54..0000000
--- a/.docker/config/supervisor/download-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:download-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=download --timeout=3600000 --memory=12000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=4
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/config/supervisor/fluidbook-process-worker.conf b/.docker/config/supervisor/fluidbook-process-worker.conf
deleted file mode 100644 (file)
index 0cbb72e..0000000
--- a/.docker/config/supervisor/fluidbook-process-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:fluidbook-process-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=fluidbookprocess --timeout=3600000 --memory=12000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=48
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/config/supervisor/medialibrary-worker.conf b/.docker/config/supervisor/medialibrary-worker.conf
deleted file mode 100644 (file)
index 2f947f0..0000000
--- a/.docker/config/supervisor/medialibrary-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:medialibrary-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=medialibrary --timeout=3600000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=12
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/config/supervisor/supervisord.conf b/.docker/config/supervisor/supervisord.conf
new file mode 100644 (file)
index 0000000..1e48365
--- /dev/null
+++ b/.docker/config/supervisor/supervisord.conf
@@ -0,0 +1,29 @@
+; supervisor config file
+
+[unix_http_server]
+file=/var/run/supervisor.sock   ; (the path to the socket file)
+chmod=0700                       ; sockef file mode (default 0700)
+
+[supervisord]
+logfile=/var/log/supervisord.log ; (main log file;default $CWD/supervisord.log)
+pidfile=/var/run/supervisord.pid ; (supervisord pidfile;default supervisord.pid)
+childlogdir=/tmp            ; ('AUTO' child log dir, default $TEMP)
+user=root   ;
+
+; the below section must remain in the config file for RPC
+; (supervisorctl/web interface) to work, additional interfaces may be
+; added by defining them in separate rpcinterface: sections
+[rpcinterface:supervisor]
+supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
+
+[supervisorctl]
+serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
+
+; The [include] section can just contain the "files" setting.  This
+; setting can list multiple files (separated by whitespace or
+; newlines).  It can also contain wildcards.  The filenames are
+; interpreted as relative to this file.  Included files *cannot*
+; include files themselves.
+
+[include]
+files = /etc/supervisor/conf.d/*.conf

diff --git a/.docker/config/supervisor/theme-worker.conf b/.docker/config/supervisor/theme-worker.conf
deleted file mode 100644 (file)
index b2aa670..0000000
--- a/.docker/config/supervisor/theme-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:theme-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=php /application/artisan queue:work --queue=theme --timeout=3600000 --memory=12000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=4
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/config/supervisor/ws2-worker.conf b/.docker/config/supervisor/ws2-worker.conf
deleted file mode 100644 (file)
index 0beb444..0000000
--- a/.docker/config/supervisor/ws2-worker.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-[program:ws2-worker]
-process_name=%(program_name)s_%(process_num)02d
-command=/usr/bin/php /application/artisan queue:work --queue=ws2 --timeout=3600000 --memory=12000
-autostart=true
-autorestart=true
-user=toolbox
-group=www-data
-numprocs=6
-redirect_stderr=true
-stdout_logfile=/proc/self/fd/2
-stopwaitsecs=3600

diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index fb89dbcac53927f35ce2900a2fde18b10a16a59e..e91d5a667f356cfb01b22fb48221e3d33b111d12 100644 (file)
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       - '/home/toolbox/www/.docker/config/rsyslog/rsyslog.conf:/etc/rsyslog.conf'
       - '/home/toolbox/www/.docker/config/rsyslog/50-default.conf:/etc/rsyslog.d/50-default.conf'
       # Supervisor
-      - '/home/toolbox/www/.docker/config/supervisor/:/etc/supervisor/conf.d/'
+      - '/home/toolbox/www/.docker/config/supervisor/:/etc/supervisor/'
       # Composer
       - '/home/toolbox/www/.docker/config/composer/:/root/.config/composer/'
       - '/home/toolbox/www/.docker/config/composer/:/application/.config/composer/'