Rename uWSGI logs from uwsgi_zerg*.log to zerg*.log

galaxyproject · Oct 22, 2018 · 796070b · 796070b
1 parent 1634bc2
commit 796070b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/env/common/templates/supervisor/galaxy.j2 b/env/common/templates/supervisor/galaxy.j2
@@ -3,7 +3,7 @@
 ;;
 
 [program:galaxy_uwsgi_zergpool]
-command         = /usr/bin/sg {{ galaxy_system_group }} '{{ galaxy_venv_dir }}/bin/uwsgi --master --zerg-pool {{ galaxy_mutable_data_dir }}/zergpool.sock:127.0.0.1:4001 --logto {{ galaxy_log_dir }}/uwsgi_zergpool.log'
+command         = /usr/bin/sg {{ galaxy_system_group }} '{{ galaxy_venv_dir }}/bin/uwsgi --master --zerg-pool {{ galaxy_mutable_data_dir }}/zergpool.sock:127.0.0.1:4001 --logto {{ galaxy_log_dir }}/zergpool.log'
 directory       = {{ galaxy_server_dir }}
 process_name    = zergpool
 priority        = 899
@@ -20,7 +20,7 @@ redirect_stderr = true
 
 {% for i in [ 0, 1 ] %}
 [program:galaxy_uwsgi_zergling{{ i }}]
-command         = /usr/bin/sg {{ galaxy_system_group }} '{{ galaxy_venv_dir }}/bin/uwsgi --ini {{ galaxy_config_dir }}/uwsgi.ini --stats 127.0.0.1:919{{ i }} --logto {{ galaxy_log_dir }}/uwsgi_zergling{{ i }}.log'
+command         = /usr/bin/sg {{ galaxy_system_group }} '{{ galaxy_venv_dir }}/bin/uwsgi --ini {{ galaxy_config_dir }}/uwsgi.ini --stats 127.0.0.1:919{{ i }} --logto {{ galaxy_log_dir }}/zergling{{ i }}.log'
 directory       = {{ galaxy_server_dir }}
 process_name    = zergling{{ i }}
 priority        = 999

diff --git a/roles/usegalaxy_privileged/templates/archive_logs.sh.j2 b/roles/usegalaxy_privileged/templates/archive_logs.sh.j2
@@ -10,7 +10,7 @@ otherlog_size="$(( 128 * 1024 * 1024 ))"  # 128MB
 
 [ ! -d "${archivedir}" ] && mkdir "${archivedir}"
 
-for logfile in ${logdir}/uwsgi*.log.*; do 
+for logfile in ${logdir}/uwsgi*.log.* ${logdir}/zerg*.log.*; do
     [ -f "${logfile}" ] || continue
     base=`basename ${logfile} | awk -F. '{print $1}'` &&
     stamp=`basename ${logfile} | awk -F. '{print $NF}'` &&