Don't use connection tracking for loopback traffic.

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

diff --git a/functions.logging b/functions.logging
index db5c8efa201fa966f54ccf6a8806b2098beff306..d3043ef8afd3a27b53a1a995d8a84efdd1c84a3a 100644 (file)
--- a/functions.logging
+++ b/functions.logging
@@ -1,21 +1,80 @@
 #!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+if [ -z "${LOG_FACILITY}" ]; then
+       LOG_FACILITY="network"
+fi
 
-LOG_FACILITY="network"
 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
 }