Tidy up coloured logging code.

diff --git a/functions.colors b/functions.colors
index 07e5778a01eca082410d7eb9f0242da1d47a4a0e..3552015957949fd0cbc866507934e4c3b89135c4 100644 (file)
--- a/functions.colors
+++ b/functions.colors
@@ -71,12 +71,6 @@ COLOUR_WARN=${COLOUR_YELLOW}
 COLOUR_ENABLED=${COLOUR_GREEN}
 COLOUR_DISABLED=${COLOUR_RED}
 
-declare -A CLR_LOG
-CLR_LOG["DEBUG"]=${CLR_CYAN_R}
-CLR_LOG["INFO"]=${CLR_BLACK_R}
-CLR_LOG["ERROR"]=${CLR_RED_B}
-CLR_LOG["WARNING"]=${CLR_YELLOW_R}
-
 COLOUR_STP_FORWARDING=${COLOUR_GREEN}
 COLOUR_STP_DISCARDING=${COLOUR_RED}
 COLOUR_STP_LEARNING=${COLOUR_YELLOW}

diff --git a/functions.logging b/functions.logging
index e43f64b81cbb87dbfe8f57f9d4c324bd7e69cc6a..e7f3a3f2a8eab66fa76935f3f40774fcc82bcbb8 100644 (file)
--- a/functions.logging
+++ b/functions.logging
@@ -48,11 +48,23 @@ function 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|INFO|WARNING|ERROR)
-                       message="${CLR_LOG[${level}]}${message}${CLR_RESET_ALL}"
+               DEBUG)
+                       colour="${CLR_CYAN_R}"
+                       ;;
+               INFO)
+                       colour="${CLR_BLACK_R}"
+                       console=""
+                       ;;
+               WARNING)
+                       colour="${CLR_YELLOW_R}"
+                       ;;
+               ERROR)
+                       colour="${CLR_RED_B}"
                        ;;
        esac
 
-       printf "${message}\n" >&2
+       printf "${colour}${message}${CLR_RESET_ALL}\n" ${out}
 }