Merge pull request #1707 from pi-hole/fix/tailFunc

Correctly retrieve IPv4/6 addresses for tailFunc()

pihole

@@ -508,13 +508,20 @@ statusFunc() {
 }
 
 tailFunc() {
-  date=$(date +'%b %d ')
   echo -e "  ${INFO} Press Ctrl-C to exit"
-  tail -f /var/log/pihole.log | sed \
+
-    -e "s,\(${date}\| dnsmasq\[.*[0-9]]\),,g" \
+  # Retrieve IPv4/6 addresses
-    -e "s,\(.*\(gravity.list\|black.list\| config \).* is \(${IPV4_ADDRESS%/*}\|${IPV6_ADDRESS:-NULL}\).*\),${COL_LIGHT_RED}&${COL_NC}," \
+  source /etc/pihole/setupVars.conf
-    -e "s,.*\(query\[A\|DHCP\).*,${COL_NC}&${COL_NC}," \
+
-    -e "s,.*,${COL_DARK_GRAY}&${COL_NC},"
+  # Strip date from each line
+  # Colour blocklist/blacklist/wildcard entries as red
+  # Colour A/AAAA/DHCP strings as white
+  # Colour everything else as gray
+  tail -f /var/log/pihole.log | sed -E \
+    -e "s,($(date +'%b %d ')| dnsmasq[.*[0-9]]),,g" \
+    -e "s,(.*(gravity.list|black.list| config ).* is (${IPV4_ADDRESS%/*}|${IPV6_ADDRESS:-NULL}).*),${COL_RED}&${COL_NC}," \
+    -e "s,.*(query\\[A|DHCP).*,${COL_NC}&${COL_NC}," \
+    -e "s,.*,${COL_GRAY}&${COL_NC},"
   exit 0
 }