From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 17 Jun 2012 22:48:05 +0000 (+0000)
Subject: Tidy up coloured logging code.
X-Git-Tag: 004~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=675d841d972a257af7302d6083e20472620fde23;p=network.git

Tidy up coloured logging code.
---

diff --git a/functions.colors b/functions.colors
index 07e5778a..35520159 100644
--- 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 e43f64b8..e7f3a3f2 100644
--- 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}
 }