Merge pull request #26 from sdr-enthusiasts/fixes

Quiet logs, s6-wrap and fix mariadb internal startup

Dockerfile

@@ -40,7 +40,8 @@ ENV BASESTATIONPORT="30003" \
     MYSQLPORT=3306 \
     S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \
     TZ=UTC \
-    WEBUSER=flightairmap
+    WEBUSER=flightairmap \
+    QUIET_FAM=true
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 

rootfs/etc/s6-overlay/scripts/02-firstrun

@@ -35,7 +35,7 @@ fi
 if [ -z "${MYSQLHOSTNAME}" ]; then
   # Check if the flightairmap database exists
   # Start mysqld without permissions
-  /usr/sbin/mysqld --skip-networking --console --log-error='' --skip-grant-tables --silent-startup &
+  /usr/sbin/mysqld --skip-networking --console --log-error='' --skip-grant-tables --silent-startup --user=root &
   # Wait for mysqld to init
   while :
   do
@@ -84,7 +84,7 @@ if [ -z "${MYSQLHOSTNAME}" ]; then
   MYSQLPASSWORD="$(pwgen -cns 30 999 | tail -1)"
 
   mysqladmin shutdown
-  /usr/sbin/mysqld --console --log-error='' --silent-startup &
+  /usr/sbin/mysqld --console --log-error='' --silent-startup --user=root &
   # Wait for mysqld to init
   echo "Waiting for database..."
   while :

rootfs/etc/s6-overlay/scripts/03-settings

@@ -1,6 +1,7 @@
 #!/command/with-contenv /bin/bash
 #shellcheck shell=bash
 
+#shellcheck disable=SC1091
 source /scripts/common
 
 NOCOLOR='\033[0m'

rootfs/etc/s6-overlay/scripts/daemon-acars

@@ -1,4 +1,8 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
 
-s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-acars.php 2>&1 | awk '{print "[daemon-acars] " $0}'
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
+"${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-acars.php

rootfs/etc/s6-overlay/scripts/daemon-spotter

@@ -1,4 +1,29 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
 
-s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-spotter.php 2>&1 | awk '{print "[daemon-spotter] " $0}'
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
+if chk_enabled $QUIET_FAM; then
+# shellcheck disable=SC1091,SC2086,SC2016
+    "${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-spotter.php 2>&1 | \
+            stdbuf -oL awk '! /\\o\//' | \
+            stdbuf -oL awk '! /DATA : /' | \
+            stdbuf -oL awk '! /New flight.../' | \
+            stdbuf -oL awk '! /New aircraft hex/' | \
+            stdbuf -oL awk '! /in archive DB/' | \
+            stdbuf -oL awk '! /already in DB/' | \
+            stdbuf -oL awk '! /Getting schedule info/' | \
+            stdbuf -oL awk '! /old values and update latest data/' | \
+            stdbuf -oL awk '! /Check if aircraft is already in DB/' | \
+            stdbuf -oL awk '! /get arrival\/departure airport/' | \
+            stdbuf -oL awk '! /Deleting Live Spotter/' | \
+            stdbuf -oL awk '! /Calculated Speed/' | \
+            stdbuf -oL awk '! /Calculated Altitude/' | \
+            stdbuf -oL awk '! /Calculated Heading/' | \
+            stdbuf -oL awk '{print $0}'
+else
+# shellcheck disable=SC1091,SC2086,SC2016
+    "${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/daemon-spotter.php
+fi

rootfs/etc/s6-overlay/scripts/mysql

@@ -1,9 +1,14 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 
 # if using local database
 if [ -z "${MYSQLHOSTNAME}" ]; then
-    /usr/sbin/mysqld --console --log-error='' 2>&1 | awk '{print "[mariadb] " $0}'
+    "${s6wrap[@]}" /usr/sbin/mysqld --console --log-error='' --user=root
 else
-    sleep 3600
+    "${s6wrap[@]}" sleep 3600
 fi

rootfs/etc/s6-overlay/scripts/nginx

@@ -1,4 +1,8 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
 
-/usr/sbin/nginx 2>&1 | awk '{print "[nginx] " $0}'
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
+"${s6wrap[@]}" /usr/sbin/nginx -g 'daemon off;'

rootfs/etc/s6-overlay/scripts/php-fpm

@@ -1,4 +1,8 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
 
-/usr/sbin/php-fpm7.4 --nodaemonize 2>&1 | awk '{print "[php-fpm] " $0}'
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
+"${s6wrap[@]}" /usr/sbin/php-fpm7.4 --nodaemonize

rootfs/etc/s6-overlay/scripts/socat

@@ -1,9 +1,14 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
 
 if [ -z "${BASESTATIONHOST}" ]; then
-  sleep 3600
+  "${s6wrap[@]}" sleep 3600
 else
   # shellcheck disable=SC2153
-  socat -d -d TCP-LISTEN:30003,fork TCP:"${BASESTATIONHOST}":"${BASESTATIONPORT}"
+  "${s6wrap[@]}" socat -d -d TCP-LISTEN:30003,fork TCP:"${BASESTATIONHOST}":"${BASESTATIONPORT}"
 fi

rootfs/etc/s6-overlay/scripts/update_db

@@ -1,5 +1,9 @@
-#!/command/with-contenv sh
-# shellcheck shell=sh
+#!/command/with-contenv bash
+# shellcheck shell=bash
 
-sleep 1h
-s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/update_db.php 2>&1 | awk '{print "[update_db] " $0}'
+# shellcheck disable=SC1091,SC2086,SC2016
+source /scripts/common
+
+s6wrap=(s6wrap --quiet --prepend="$(basename "$0")" --timestamps --args)
+"${s6wrap[@]}" sleep 1h
+"${s6wrap[@]}" s6-setuidgid "$WEBUSER" php /var/www/flightairmap/htdocs/scripts/update_db.php