Merge coreander:/srv/git/source.jones.dk/sbin

1 files changed, 15 insertions, 4 deletions

diff --git a/showlog b/showlog
index 477fe75..f23ca99 100755
--- a/showlog
+++ b/showlog
@@ -10,8 +10,10 @@
 
 set -e
 
+logfilecount="${logfilecount:-1}"
+
 usage()	{
-	echo "Usage: $(basename $0) ftp|web|weberror|websuexec|mail|system [<keyword> [<keyword>...]]"
+	echo "Usage: $(basename $0) ftp|web|weberror|websuexec|mail|sms|smsbox|bearerbox|system [<keyword> [<keyword>...]]"
 	exit 1
 }
 
@@ -67,6 +69,12 @@ case "$target" in
     mail)
 	log="mail.log"
 	;;
+    sms|smsbox)
+	log="smsbox.log"
+	;;
+    bearerbox)
+	log="bearerbox.log"
+	;;
     system)
 	log="syslog"
 	;;
@@ -81,13 +89,16 @@ case "$target" in
     web|weberror|weberrors|websuexec)
 	logroot="/var/log/apache"
 	;;
+    sms|smsbox|bearerbox)
+	logroot="/var/log/kannel"
+	;;
     *)
 	usage
 	exit1 "Undefined logroot for \"$target\""
 	;;
 esac
 case "$target" in
-    ftp|web|weberror|weberrors|websuexec|mail|system)
+    ftp|web|weberror|weberrors|websuexec|mail|sms|smsbox|bearerbox|system)
 	logpattern="$(printf '.*/%s(\.[[:digit:]]+(\.gz)?)?\n' "$log")"
 	;;
     *)
@@ -100,9 +111,9 @@ if [ $# -gt 0 ]; then
 	for keyword in $@; do
 		grep_opts="$opts -e $keyword"
 	done
-	cat_logs "$logroot" "$logpattern" 7 | grep -i $grep_opts | tail -n $tail_history
+	cat_logs "$logroot" "$logpattern" "$logfilecount" | grep -i $grep_opts | tail -n $tail_history
 #	[ -f $logroot/$log ] && tail -n 0 -F $logroot/$log | grep -i $grep_opts
 else
-	cat_logs "$logroot" "$logpattern" 7 | tail -n $tail_history
+	cat_logs "$logroot" "$logpattern" "$logfilecount" | tail -n $tail_history
 #	[ -f $logroot/$log ] && tail -n 0 -F $logroot/$log
 fi