Merge pull request #54 from kibatic/refacto_logs_service

Remove useless services
kibatic · Apr 8, 2019 · 29a616e · 29a616e
2 parents d24194b + de95412
commit 29a616e
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/7.0/rootfs/etc/supervisor/conf.d/app-log.conf b/7.0/rootfs/etc/supervisor/conf.d/app-log.conf
@@ -1,4 +1,10 @@
 [program:app-log]
-command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s"
+command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+
+[program:php-fpm-logs]
+command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+redirect_stderr=true
diff --git a/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf b/7.0/rootfs/etc/supervisor/conf.d/php-fpm.conf
@@ -4,8 +4,3 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 redirect_stderr=true
 
-[program:php-fpm-logs]
-command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-redirect_stderr=true
diff --git a/7.1/rootfs/etc/supervisor/conf.d/app-log.conf b/7.1/rootfs/etc/supervisor/conf.d/app-log.conf
@@ -1,4 +1,10 @@
 [program:app-log]
-command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s"
+command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+
+[program:php-fpm-logs]
+command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+redirect_stderr=true
diff --git a/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf b/7.1/rootfs/etc/supervisor/conf.d/php-fpm.conf
@@ -4,8 +4,3 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 redirect_stderr=true
 
-[program:php-fpm-logs]
-command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-redirect_stderr=true
diff --git a/7.2/rootfs/etc/supervisor/conf.d/app-log.conf b/7.2/rootfs/etc/supervisor/conf.d/app-log.conf
@@ -1,4 +1,10 @@
 [program:app-log]
-command=/bin/bash -c "tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log %(ENV_LOG_STREAM)s"
+command=/usr/bin/tail -q -n 0 -F app/logs/dev.log app/logs/prod.log var/logs/dev.log var/logs/prod.log
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
+
+[program:php-fpm-logs]
+command=/usr/bin/tail -q -n 0 --follow=descriptor --retry %(ENV_LOG_STREAM)s
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+redirect_stderr=true