add -n to logger as echo -n
This commit is contained in:
parent
1527daae36
commit
7563e0f76f
2 changed files with 36 additions and 6 deletions
|
@ -656,7 +656,7 @@ reachable () {
|
||||||
[ ${SEC} -gt 1 -a $i -lt ${SEC} ] && sleep 1
|
[ ${SEC} -gt 1 -a $i -lt ${SEC} ] && sleep 1
|
||||||
done
|
done
|
||||||
|
|
||||||
[ ${res} -gt 0 ] && loginfo " not reachable" >&2 || loginfo " success" >&2;
|
[ ${res} -gt 0 ] && loginfo -n " not reachable" >&2 || loginfo -n " success" >&2;
|
||||||
|
|
||||||
return $res
|
return $res
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,19 @@ function EXIT(){
|
||||||
|
|
||||||
function logerror(){
|
function logerror(){
|
||||||
local function_name="${FUNCNAME[1]}"
|
local function_name="${FUNCNAME[1]}"
|
||||||
|
case $1 in
|
||||||
|
-n)
|
||||||
|
local opts="-n"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
timeAndDate=`date`
|
timeAndDate=`date`
|
||||||
local loglevels
|
local loglevels
|
||||||
declare -a loglevels
|
declare -a loglevels
|
||||||
loglevels=()
|
loglevels=()
|
||||||
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
||||||
echo $msg >&2
|
echo $opts $msg >&2
|
||||||
fi
|
fi
|
||||||
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
||||||
echo "[$timeAndDate] [ERROR] $msg" >> $SCRIPT_LOG
|
echo "[$timeAndDate] [ERROR] $msg" >> $SCRIPT_LOG
|
||||||
|
@ -50,13 +56,19 @@ function logerror(){
|
||||||
|
|
||||||
function logwarn(){
|
function logwarn(){
|
||||||
local function_name="${FUNCNAME[1]}"
|
local function_name="${FUNCNAME[1]}"
|
||||||
|
case $1 in
|
||||||
|
-n)
|
||||||
|
local opts="-n"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
timeAndDate=`date`
|
timeAndDate=`date`
|
||||||
local loglevels
|
local loglevels
|
||||||
declare -a loglevels
|
declare -a loglevels
|
||||||
loglevels=("ERROR" )
|
loglevels=("ERROR" )
|
||||||
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
||||||
echo $msg >&2
|
echo $opts $msg >&2
|
||||||
fi
|
fi
|
||||||
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
||||||
echo "[$timeAndDate] [WARN] $msg" >> $SCRIPT_LOG
|
echo "[$timeAndDate] [WARN] $msg" >> $SCRIPT_LOG
|
||||||
|
@ -65,13 +77,19 @@ function logwarn(){
|
||||||
|
|
||||||
function loginfo(){
|
function loginfo(){
|
||||||
local function_name="${FUNCNAME[1]}"
|
local function_name="${FUNCNAME[1]}"
|
||||||
|
case $1 in
|
||||||
|
-n)
|
||||||
|
local opts="-n"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
timeAndDate=`date`
|
timeAndDate=`date`
|
||||||
local loglevels
|
local loglevels
|
||||||
declare -a loglevels
|
declare -a loglevels
|
||||||
loglevels=("ERROR" "WARN" )
|
loglevels=("ERROR" "WARN" )
|
||||||
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
||||||
echo $msg >&2
|
echo $opts $msg >&2
|
||||||
fi
|
fi
|
||||||
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
||||||
echo "[$timeAndDate] [INFO] $msg" >> $SCRIPT_LOG
|
echo "[$timeAndDate] [INFO] $msg" >> $SCRIPT_LOG
|
||||||
|
@ -81,13 +99,19 @@ function loginfo(){
|
||||||
|
|
||||||
function logdebug(){
|
function logdebug(){
|
||||||
local function_name="${funcname[1]}"
|
local function_name="${funcname[1]}"
|
||||||
|
case $1 in
|
||||||
|
-n)
|
||||||
|
local opts="-n"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
timeAndDate=`date`
|
timeAndDate=`date`
|
||||||
local loglevels
|
local loglevels
|
||||||
declare -a loglevels
|
declare -a loglevels
|
||||||
loglevels=("ERROR" "WARN" "INFO")
|
loglevels=("ERROR" "WARN" "INFO")
|
||||||
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
||||||
echo $msg >&2
|
echo $opts $msg >&2
|
||||||
fi
|
fi
|
||||||
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
||||||
echo "[$timeAndDate] [DEBUG] $msg" >> $SCRIPT_LOG
|
echo "[$timeAndDate] [DEBUG] $msg" >> $SCRIPT_LOG
|
||||||
|
@ -96,13 +120,19 @@ function logdebug(){
|
||||||
|
|
||||||
function logtrace(){
|
function logtrace(){
|
||||||
local function_name="${funcname[1]}"
|
local function_name="${funcname[1]}"
|
||||||
|
case $1 in
|
||||||
|
-n)
|
||||||
|
local opts="-n"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
esac
|
||||||
local msg="$1"
|
local msg="$1"
|
||||||
timeAndDate=`date`
|
timeAndDate=`date`
|
||||||
local loglevels
|
local loglevels
|
||||||
declare -a loglevels
|
declare -a loglevels
|
||||||
loglevels=("ERROR" "WARN" "INFO" "DEBUG")
|
loglevels=("ERROR" "WARN" "INFO" "DEBUG")
|
||||||
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${LOGLEVEL-$MYHSELLCONFIG_LOGLEVEL_DEFAULT}" ]];then
|
||||||
echo $msg >&2
|
echo $opts $msg >&2
|
||||||
fi
|
fi
|
||||||
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
if [[ ! ${loglevels[*]} =~ "${FILELOGLEVEL-$MYHSELLCONFIG_FILELOGLEVEL_DEFAULT}" ]];then
|
||||||
echo "[$timeAndDate] [TRACE] $msg" >> $SCRIPT_LOG
|
echo "[$timeAndDate] [TRACE] $msg" >> $SCRIPT_LOG
|
||||||
|
|
Loading…
Reference in a new issue