Move timestamp function to main.sh

Author: Kristan Kenney

bin/v-add-backup-host

@@ -169,9 +169,7 @@ fi
 
 # Adding backup host
 if [ $type != 'local' ]; then
-    time_n_date=$(date +'%T %F')
-    time=$(echo "$time_n_date" |cut -f 1 -d \ )
-    date=$(echo "$time_n_date" |cut -f 2 -d \ )
+    new_timestamp
     str="HOST='$host'\nUSERNAME='$user'\nPASSWORD='$password'"
     str="$str\nBPATH='$path'\nPORT='$port'\nTIME='$time'\nDATE='$date'"
     echo -e "$str" > $HESTIA/conf/$type.backup.conf

bin/v-list-sys-rrd

@@ -21,9 +21,7 @@ json_list() {
     echo "{"
 
     # Generating timestamp
-    time_n_date=$(date +'%T %F')
-    TIME=$(echo "$time_n_date" |cut -f 1 -d \ )
-    DATE=$(echo "$time_n_date" |cut -f 2 -d \ )
+    new_timestamp
 
     for type in $rrd_types; do
         for rrd in $(ls $RRD/$type |grep rrd$ |sed "s/\.rrd$//g"); do

func/main.sh

@@ -37,6 +37,13 @@ E_RRD=18
 E_UPDATE=19
 E_RESTART=20
 
+# Generate time stamp
+new_timestamp() {
+    time_n_date=$(date +'%T %F')
+    time=$(echo "$time_n_date" |cut -f 1 -d \ )
+    date=$(echo "$time_n_date" |cut -f 2 -d \ )
+}
+
 # Event string for logger
 for ((I=1; I <= $# ; I++)); do
     if [[ "$HIDE" != $I ]]; then