From ebb8194170e82319ef6cdc9377aad0cdc5aa5592 Mon Sep 17 00:00:00 2001 From: Jonny007-MKD Date: Mon, 19 Oct 2020 20:59:52 +0200 Subject: [PATCH] Prettier timestamp --- service-by-telegram.sh | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/service-by-telegram.sh b/service-by-telegram.sh index 4a3d132..ddd3ca0 100755 --- a/service-by-telegram.sh +++ b/service-by-telegram.sh @@ -97,19 +97,43 @@ case "$SERVICESTATE" in *) SERVICESTATEICON="[$SERVICESTATE]";; esac +# convert date +dateInSec=$(date -d "$LONGDATETIME" +%s) +nowInSec=$(date +%s) +ageInSec=$(($nowInSec - $dateInSec)) +ageInMin=$(($ageInSec/60)) +ageInHours=$(($ageInMin/60)) +ageInDays=$(($ageInHours/24)) +if [ "${LONGDATETIME:0:10}" == "$(date +"%Y-%m-%d")" ]; then + LONGDATETIME="${LONGDATETIME:11}" +fi + +date=${LONGDATETIME#} +if [ $ageInDays -gt 0 ]; then + age="${ageInDays}d $(($ageInHours-$ageInDays*24))h ($LONGDATETIME)" +elif [ $ageInHours -gt 0 ]; then + age="${ageInHours}h $(($ageInMin-$ageInHours*60))min ($LONGDATETIME)" +elif [ $ageInMin -gt 0 ]; then + age="${ageInMin}min $(($ageInSec-$ageInMin*60))s" +elif [ $ageInSec -gt 5 ]; then + age="${ageInSec}s" +else + age="$LONGDATETIME" +fi + ## Build the message itself NOTIFICATION_MESSAGE=$(cat << EOF -$SERVICESTATEICON $SERVICEDISPLAYNAME is ${SERVICESTATE} since $LONGDATETIME -Host: $HOSTALIAS (IPv4 $HOSTADDRESS) +$SERVICESTATEICON $SERVICEDISPLAYNAME is ${SERVICESTATE} since $age +Host: $HOSTALIAS (IPv4 $HOSTADDRESS EOF ) ## Is this host IPv6 capable? if [ -n "$HOSTADDRESS6" ] ; then - NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE -IPv6? $HOSTADDRESS6" + NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE, IPv6 $HOSTADDRESS6" fi +NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE)" NOTIFICATION_MESSAGE="$NOTIFICATION_MESSAGE More info: $SERVICEOUTPUT"