feat - add basic cron expression scheduling

install/assets/dbbackup/template-dbbackup/run

@@ -19,34 +19,53 @@ if [[ "${MODE,,}" =~ "standalone" ]] || [ "${1,,}" = "manual" ] || [ "${1,,}" =
     backup_job_backup_begin=+0
 else
     silent sleep {{BACKUP_NUMBER}}
-    current_time=$(date +'%s')
-    today=$(date +"%Y%m%d")
+    time_last_run=0
+    time_current=$(date +'%s')
 
-    if [[ ${backup_job_backup_begin} =~ ^\+(.*)$ ]]; then
-        waittime=$(( ${BASH_REMATCH[1]} * 60 ))
-        target_time=$(($current_time + $waittime))
+    if [[ "${backup_job_backup_begin}" =~ ^\+(.*)$ ]]; then
+        print_debug "BACKUP_BEGIN is a jump of minute starting with +"
+        timer plus_value
+    elif [[ "${backup_job_backup_begin}" =~ ^[0-9]{4}$ ]]; then
+        print_debug "BACKUP_BEGIN is a HHMM value"
+        timer time
+    elif [[ "${backup_job_backup_begin}" =~ ([0-9]{4})-([0-9]{2})-([0-9]{2})[[:space:]]([0-9]{2}):([0-9]{2}):([0-9]{2}) ]]; then
+        print_debug "BACKUP_BEGIN is a full date timestamp"
+        timer datetime
+    elif echo ${backup_job_backup_begin//\*/#} | grep -qP "^(((\d+,)+\d+|(\d+(\/|-)\d+)|\d+|#) ?){5}$" ; then
+        print_debug "BACKUP_BEGIN is a cron expression"
+        time_last_run=$(date +"%s")
+        timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}"
     else
-        target_time=$(date --date="${today} ${backup_job_backup_begin}" +'%s')
-        if [[ "$target_time" < "$current_time" ]]; then
-            target_time=$(($target_time + 24*60*60))
-        fi
-        waittime=$(($target_time - $current_time))
+        print_error "_BACKUP_BEGIN is invalid - Unable to perform scheduling"
+        cat <<EOF
+
+        Valid Methods:
+          +(number)             - Start in however many minutes
+          HHMM                  - Start at hour (00-24) and minute (00-59)
+          YYYY-MM-DD HH:mm:ss   - Start at a specific date and time
+          0 23 * * *            - Cron expression
+
+EOF
+        print_error "Stopping backup_scheduler {{BACKUP_NUMBER}} due to detected errors. Fix and restart container."
+        stop_scheduler_backup=true
+        s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
     fi
-    print_debug "Wait Time: ${waittime} Target time: ${target_time} Current Time: ${current_time}"
-    print_info "Next Backup at $(date -d @${target_time} +'%Y-%m-%d %T %Z')"
-    silent sleep $waittime
-    set +x
+
+    print_debug "Wait Time: ${time_wait} Future execution time: ${time_future} Current Time: ${time_current}"
+    print_info "Next Backup at $(date -d @${time_future} +'%Y-%m-%d %T %Z')"
+    silent sleep ${time_wait}
 fi
 
 while true; do
     if [ -n "${backup_job_blackout_start}" ] && [ -n "${backup_job_blackout_finish}" ] ; then
-        hour_minute=$(date +%H%M)
-        if [[ "${hour_minute}" > "${backup_job_blackout_start}" ]] && [[ "${hour_minute}" < "${backup_job_blackout_finish}" ]] ; then
+        time_current_hour_minute=$(date +%H%M)
+        if [[ "${time_current_hour_minute}" > "${backup_job_blackout_start}" ]] && [[ "${time_current_hour_minute}" < "${backup_job_blackout_finish}" ]] ; then
             blackout=true
         else
             blackout=false
         fi
     fi
+
     if var_true "${blackout}" ; then
         print_notice "Detected Blackout Period - Not performing backup operations"
     else
@@ -55,40 +74,8 @@ while true; do
         echo "{{BACKUP_NUMBER}}" >> /tmp/.container/db-backup-backups
         print_debug "Backup {{BACKUP_NUMBER}} routines started time: $(date +'%Y-%m-%d %T %Z')"
         bootstrap_filesystem
-        case "${dbtype,,}" in
-            "couch" )
-                check_availability
-                backup_couch
-            ;;
-            "influx" )
-                check_availability
-                backup_influx
-            ;;
-            "mssql" )
-                check_availability
-                backup_mssql
-            ;;
-            "mysql" )
-                check_availability
-                backup_mysql
-            ;;
-            "mongo" )
-                check_availability
-                backup_mongo
-            ;;
-            "pgsql" )
-                check_availability
-                backup_pgsql
-            ;;
-            "redis" )
-                check_availability
-                backup_redis
-            ;;
-            "sqlite3" )
-                check_availability
-                backup_sqlite3
-            ;;
-        esac
+        check_availability
+        backup_${dbtype,,}
         timer job stop
         if [ -z "${exitcode_backup}" ] ; then exitcode_backup="0" ; fi
         print_info "Backup {{BACKUP_NUMBER}} routines finish time: $(date -d @${backup_job_finish_time} +'%Y-%m-%d %T %Z') with exit code ${exitcode_backup}"
@@ -106,8 +93,15 @@ while true; do
             print_error "Stopping backup_scheduler {{BACKUP_NUMBER}} due to detected errors. Fix and restart container."
             s6-svc -d /var/run/s6/legacy-services/dbbackup-{{BACKUP_NUMBER}}
         else
-            print_notice "Sleeping for another $(($backup_job_backup_interval*60-backup_job_total_time)) seconds. Waking up at $(date -d@"$(( $(date +%s)+$(($backup_job_backup_interval*60-backup_job_total_time))))" +'%Y-%m-%d %T %Z') "
-            silent sleep $(($backup_job_backup_interval*60-backup_job_total_time))
+            if [ ! "${time_cron}" = "true" ]; then
+                print_notice "Sleeping for another $(($backup_job_backup_interval*60-backup_job_total_time)) seconds. Waking up at $(date -d@"$(( $(date +%s)+$(($backup_job_backup_interval*60-backup_job_total_time))))" +'%Y-%m-%d %T %Z') "
+                silent sleep $(($backup_job_backup_interval*60-backup_job_total_time))
+            else
+                time_last_run=$(date +"%s")
+                timer cron "${backup_job_backup_begin}" "${time_current}" "${time_last_run}"
+                print_notice "Sleeping for another ${time_wait} seconds. Waking up at $(date -d@${time_future} +'%Y-%m-%d %T %Z') "
+                silent sleep ${time_wait}
+            fi
         fi
     fi
 done