more logging beautification

sdr-enthusiasts · Oct 23, 2023 · e83f013 · e83f013
1 parent 80ce1aa
commit e83f013
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/rootfs/etc/default/logrotate.conf b/rootfs/etc/default/logrotate.conf
@@ -1,5 +1,5 @@
 /var/log/radar1090 {
   rotate 0
-  size 25k
+  size 10k
   copytruncate
 }
diff --git a/rootfs/etc/s6-overlay/scripts/radar1090 b/rootfs/etc/s6-overlay/scripts/radar1090
@@ -73,7 +73,7 @@ if ! valid_ip "$beast_host"; then
     chk_enabled "$VERBOSE" && "${s6wrap[@]}" --args echo "BEASTHOST (\"${BEASTHOST:-ultrafeeder}\") successfully resolved to $beast_host" || true
 fi
 
-RADAR_BIN=(/usr/sbin/radar)
+RADAR_BIN=(stdbuf -oL /usr/sbin/radar)
 
 RADAR_CMD=("-b")
 RADAR_CMD+=("-k ${RADAR1090_KEY}")

diff --git a/rootfs/etc/s6-overlay/scripts/radar1090-log b/rootfs/etc/s6-overlay/scripts/radar1090-log
@@ -58,6 +58,10 @@ while true; do
     readarray -t loglines <<< "$(tail -"$WAITTIME" "$LOGFILE")"
     # Immediately clear logs:
     logrotate -f /etc/default/logrotate.conf
+    # see if we need to clean up the last loglines entry because often it's incomplete
+    if [[ -z "$(awk '{ print $11 }' <<< "${loglines[-1]}")" ]]; then
+        unset 'loglines[-1]'
+    fi
 
     # Now parse some statistics:
     packets=("$(awk '{ print $3 }' <<< "$(printf "%s\n" "${loglines[@]}")")")