Don't use connection tracking for loopback traffic.

[people/stevee/network.git] / functions.logging

diff --git a/functions.logging b/functions.logging
index e909a74e5a712c3240072b1e1e7a4c0fa68027c6..d3043ef8afd3a27b53a1a995d8a84efdd1c84a3a 100644 (file)
--- a/functions.logging
+++ b/functions.logging
@@ -19,22 +19,62 @@
 #                                                                             #
 ###############################################################################
 
-LOG_FACILITY="network"
+if [ -z "${LOG_FACILITY}" ]; then
+       LOG_FACILITY="network"
+fi
+
 LOG_LEVEL="DEBUG"
 
+if [ -z "${LOG_DISABLE_STDOUT}" ]; then
+       LOG_DISABLE_STDOUT=false
+fi
+
 function log() {
        local level=${1}
        shift
        local message="$@"
+       local message_log="${message}"
 
        if [ -z "${DEBUG}" ] && [ "${level}" = "DEBUG" ]; then
                return
        fi
 
+       local funcname="${FUNCNAME[1]}"
+       message_log="${funcname}: ${message_log}"
+
        # Set a prefix if we are in a hook.
        if [ -n "${HOOK}" ]; then
-               message="${HOOK}: ${message}"
+               message_log="${HOOK}: ${message_log}"
        fi
 
-       logger -t ${LOG_FACILITY} "${message}"
+       logger -t "${LOG_FACILITY}[$$]" "${message_log}" &
+
+       # Leave here, when there should be no output on the console.
+       [ "${LOG_DISABLE_STDOUT}" = "true" ] && return 0
+
+       local colour
+       local console="2"
+       case "${level}" in
+               DEBUG)
+                       colour="${CLR_CYAN_R}"
+                       ;;
+               INFO)
+                       console="1"
+                       ;;
+               WARNING)
+                       colour="${CLR_YELLOW_R}"
+                       ;;
+               ERROR)
+                       colour="${CLR_RED_B}"
+                       ;;
+       esac
+
+       case "${console}" in
+               1)
+                       printf "${colour}${message}${CLR_RESET}\n"
+                       ;;
+               2)
+                       printf "${colour}${message}${CLR_RESET}\n" >&2
+                       ;;
+       esac
 }