Minor changes and removed reference to blacklist.t

.gitignore

@@ -4,33 +4,28 @@
 # Add back files with extensions and directories
 !*.*
 !*/
-!VERSION
-
-!testcoverage
 !.travis.yml
+!testcoverage
+!VERSION
 
-# Ignore debug
-*.debug
-blacklist.*
-*.amd64
-*.mips
-*.mipsel
-
-# Ignore test
-*.test
-
-.idea/
-.vscode/
-vendor/
+# Ignore
 .coveralls.yml
 .DS_Store
+.git.bfg-report/
+.idea/
+.payload/config/scripts/update-dnsmasq
+.vscode/
+*.amd64
 *.bak
 *.bkp
+*.deb
+*.debug
 *.lock
 *.log
-*.VC.db
+*.mips
+*.mipsel
 *.out
-*.deb
-.git.bfg-report/
-
-.payload/config/scripts/update-dnsmasq
+*.test
+*.VC.db
+blacklist.*
+vendor/

.payload/post-install.sh

@@ -64,31 +64,31 @@ echo_logger() {
 	case "${1}" in
 	E)
 		shift
-		MSG="$(red)$(bold)ERRO$(normal)[${CTR}]${TIME} ▶ ${@} failed!"
+		MSG="$(red)$(bold)ERRO$(normal)[${CTR}]${TIME}: ${@} failed!"
 		;;
 	F)
 		shift
-		MSG="$(red)$(bold)FAIL$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(red)$(bold)FAIL$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	FE)
 		shift
-		MSG="$(red)$(bold)CRIT$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(red)$(bold)CRIT$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	I)
 		shift
-		MSG="$(green)INFO$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(green)INFO$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	S)
 		shift
-		MSG="$(green)$(bold)NOTI$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(green)$(bold)NOTI$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	T)
 		shift
-		MSG="$(tan)$(bold)TRYI$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(tan)$(bold)TRYI$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	W)
 		shift
-		MSG="$(yellow)$(bold)WARN$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(yellow)$(bold)WARN$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	*)
 		echo "ERROR: usage: echo_logger MSG TYPE(E, F, FE, I, S, T, W) MSG."
@@ -240,5 +240,3 @@ update_dns_configuration() {
 
 update_dns_configuration
 try chgrp -R vyattacfg /opt/vyatta/config/active
-
-echo -e ${msg}

.payload/pre-remove.sh

@@ -57,31 +57,31 @@ echo_logger() {
 	case "${1}" in
 	E)
 		shift
-		MSG="$(red)$(bold)ERRO$(normal)[${CTR}]${TIME} ▶ ${@} failed!"
+		MSG="$(red)$(bold)ERRO$(normal)[${CTR}]${TIME}: ${@} failed!"
 		;;
 	F)
 		shift
-		MSG="$(red)$(bold)FAIL$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(red)$(bold)FAIL$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	FE)
 		shift
-		MSG="$(red)$(bold)CRIT$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(red)$(bold)CRIT$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	I)
 		shift
-		MSG="$(green)INFO$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(green)INFO$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	S)
 		shift
-		MSG="$(green)$(bold)NOTI$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(green)$(bold)NOTI$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	T)
 		shift
-		MSG="$(tan)$(bold)TRYI$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(tan)$(bold)TRYI$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	W)
 		shift
-		MSG="$(yellow)$(bold)WARN$(normal)[${CTR}]${TIME} ▶ ${@}"
+		MSG="$(yellow)$(bold)WARN$(normal)[${CTR}]${TIME}: ${@}"
 		;;
 	*)
 		echo "ERROR: usage: echo_logger MSG TYPE(E, F, FE, I, S, T, W) MSG."

main.go

@@ -42,10 +42,10 @@ var (
 		exitCmd(1)
 	}
 
-	logFile   = fmt.Sprintf("/var/log/%s.log", progname)
-	logInfo   = log.Info
-	logInfof  = log.Infof
-	logNotice = log.Notice
+	logFile  = fmt.Sprintf("/var/log/%s.log", progname)
+	logInfo  = log.Info
+	logInfof = log.Infof
+	// logNotice = log.Notice
 	logPrintf = logInfof
 	// logPrintln = logInfo
 
@@ -165,7 +165,7 @@ func newLog() *logging.Logger {
 		logFile = fmt.Sprintf("/tmp/%s.log", progname)
 	}
 	fdFmt := logging.MustStringFormatter(
-		`%{level:.4s}[%{id:03x}]%{time:2006-01-02 15:04:05.000}{` + progname + `} ▶ %{message}`,
+		`%{level:.4s}[%{id:03x}]%{time:2006-01-02 15:04:05.000}{` + progname + `}: %{message}`,
 	)
 
 	fd, err := os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
@@ -227,7 +227,7 @@ func screenLog() {
 			logFile = fmt.Sprintf("/tmp/%s.log", progname)
 		}
 		scrFmt := logging.MustStringFormatter(
-			`%{color:bold}%{level:.4s}%{color:reset}[%{id:03x}]%{time:15:04:05.000} ▶ %{message}`,
+			`%{color:bold}%{level:.4s}%{color:reset}[%{id:03x}]%{time:15:04:05.000}: %{message}`,
 		)
 
 		scr := logging.NewLogBackend(os.Stderr, progname+": ", 0)