From 8f8f7b19da00d0000a33bcfd89835b5251f0c738 Mon Sep 17 00:00:00 2001 From: niwa-hideyuki Date: Sat, 2 Apr 2016 11:12:07 +0900 Subject: [PATCH] Addition of a new log function --- src/cmd/slot-os | 41 ++++++++++++++++++++++++++++++++++++----- src/lib/lib-image-catalog | 2 +- src/subcmd/br-add | 2 +- src/subcmd/console | 4 ++-- src/subcmd/erase | 2 +- src/subcmd/restart | 2 +- src/subcmd/resume | 2 +- src/subcmd/start | 2 +- src/subcmd/stop | 2 +- src/subcmd/suspend | 2 +- 10 files changed, 46 insertions(+), 15 deletions(-) diff --git a/src/cmd/slot-os b/src/cmd/slot-os index 09b2c31..66c4e32 100755 --- a/src/cmd/slot-os +++ b/src/cmd/slot-os @@ -7,15 +7,22 @@ umask 022 LOGFILE=/var/log/fulcon/slot-os.log -print_log() +print_log1() +{ + EXLINE=$* + DATETIME=`date "+%m%d:%H%M%S"` + echo $DATETIME ":" slot-os $EXLINE >> $LOGFILE +} + +print_log2() { EXLINE=$* while read l do - echo $l + echo $l 1>&2 echo $l | egrep "^error:" >& /dev/null if [ $? -eq 0 ]; then - DATETIME=`date "+%Y%m%d%H%M%S"` + DATETIME=`date "+%m%d:%H%M%S"` echo $DATETIME ":" slot-os $EXLINE ":" $l >> $LOGFILE fi done @@ -56,8 +63,32 @@ if [ $# -eq 0 ] ; then else if [ -f /usr/lib/slot-os/sbin/$1 ]; then EXLINE=`echo /usr/lib/slot-os/sbin/$* | sed -e 's/\$//g' -e 's/\`//g' -e "s/'//g" -e 's/\"//g' -e 's/;//g' -e 's/&//g' -e 's/|//g'` -# . $EXLINE |& print_log $* - . $EXLINE + case $1 in + "start" ) print_log1 $* ;; + "stop" ) print_log1 $* ;; + "restart" ) print_log1 $* ;; + "suspend" ) print_log1 $* ;; + "resume" ) print_log1 $* ;; + "backup" ) print_log1 $* ;; + "backup-del" ) print_log1 $* ;; + "backup-restore" ) print_log1 $* ;; + "update" ) print_log1 $* ;; + "update-prog" ) print_log1 $* ;; + "update-deploy" ) print_log1 $* ;; + esac + + case $1 in + "console" ) . $EXLINE ;; + "list" ) . $EXLINE ;; + "autostart" ) . $EXLINE ;; + "help" ) . $EXLINE ;; + "list" ) . $EXLINE ;; + "backup-list" ) . $EXLINE ;; + "br-info" ) . $EXLINE ;; + "net-info" ) . $EXLINE ;; + * ) . $EXLINE | print_log2 $* ;; + esac + else echo "error: unknown command:" $1 fi diff --git a/src/lib/lib-image-catalog b/src/lib/lib-image-catalog index 4b94ddb..46e75fa 100755 --- a/src/lib/lib-image-catalog +++ b/src/lib/lib-image-catalog @@ -4,7 +4,7 @@ ls /var/lib/fulcon/driver/dockerfile/* >& /dev/null if [ $? -ne 0 ]; then - echo "there is not a image" + echo "error: there is not a image" exit -1 fi diff --git a/src/subcmd/br-add b/src/subcmd/br-add index 6e38173..e1d5baa 100755 --- a/src/subcmd/br-add +++ b/src/subcmd/br-add @@ -55,7 +55,7 @@ fi if [ x"$NETDEV" != x"" ]; then ip a show $NETDEV >& /dev/null if [ $? -ne 0 ]; then - echo "can't find a NET_DEVICE:" $NETDEV + echo "error: can't find a NET_DEVICE:" $NETDEV exit -1 fi fi diff --git a/src/subcmd/console b/src/subcmd/console index 432e383..16e072f 100755 --- a/src/subcmd/console +++ b/src/subcmd/console @@ -35,7 +35,7 @@ if [ $FLG_N -eq 1 ]; then N=`printf "%04d" $i` ST=`fulcon list | awk '{if ($1 == "'$NAME$N'") {if ($2 == "RUNNING"){print 0} else {print 1}}}'` if [ x"$ST" != x"0" ]; then - echo $NAME$N "is not running" + echo "error:" $NAME$N "is not running" else gnome-terminal -e "lib-console $OPT_FLG $NAME$N" >& /dev/null if [ $? -ne 0 ]; then @@ -67,7 +67,7 @@ for i in $NAMES do ST=`fulcon list | awk '{if ($1 == "'$i'") {if ($2 == "RUNNING"){print 0} else {print 1}}}'` if [ x"$ST" != x"0" ]; then - echo $i "is not running" + echo "error:" $i "is not running" else lib-console $OPT_FLG $i diff --git a/src/subcmd/erase b/src/subcmd/erase index c775918..7e44fd2 100755 --- a/src/subcmd/erase +++ b/src/subcmd/erase @@ -40,7 +40,7 @@ if [ $FLG_N -eq 1 ]; then done; exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi diff --git a/src/subcmd/restart b/src/subcmd/restart index 7639d53..7609d2f 100755 --- a/src/subcmd/restart +++ b/src/subcmd/restart @@ -61,7 +61,7 @@ if [ $FLG_N -eq 1 ]; then done; exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi diff --git a/src/subcmd/resume b/src/subcmd/resume index ebe8eba..0364858 100755 --- a/src/subcmd/resume +++ b/src/subcmd/resume @@ -42,7 +42,7 @@ if [ $FLG_N -eq 1 ]; then done; exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi diff --git a/src/subcmd/start b/src/subcmd/start index 358105f..b831a29 100755 --- a/src/subcmd/start +++ b/src/subcmd/start @@ -58,7 +58,7 @@ if [ $FLG_N -eq 1 ]; then done; exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi diff --git a/src/subcmd/stop b/src/subcmd/stop index ecedc19..38e74be 100755 --- a/src/subcmd/stop +++ b/src/subcmd/stop @@ -40,7 +40,7 @@ if [ $FLG_N -eq 1 ]; then echo stop $NAME$N exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi diff --git a/src/subcmd/suspend b/src/subcmd/suspend index 9fe88c1..3661f1e 100755 --- a/src/subcmd/suspend +++ b/src/subcmd/suspend @@ -42,7 +42,7 @@ if [ $FLG_N -eq 1 ]; then done; exit 0 else - echo "REPEAT_NUMBER must be [1...999]" + echo "error: REPEAT_NUMBER must be [1...999]" exit -1 fi -- 2.11.0