Introduce a scheduler job to delete old files that may accumulate over time

CHANGES.md

@@ -98,6 +98,15 @@
       - Answer: This is a hack that would work based on the specific way that the docker-crontab image sets schedules.
                 However, this is not obvious to the user and is unreliable since it is not documented.
 
+- Introduce a scheduler job to delete old files that may accumulate over time
+
+  Creates the `optional-component-clean_old_files` job that deletes old THREDDS log files and WPS output files.
+  Allows individual cleanup jobs to be enabled for each of `raven`, `finch`, `hummingbird`, and `thredds` components.
+  Allows the user to configure how old a file must be before it is deleted (age in days) and how to calculate the age
+  of the file (time since last modified, time since last accessed, time since created).
+
+  (see `env.local.example` or the `scheduler` documentation for details).
+
 [2.10.1](https://github.com/bird-house/birdhouse-deploy/tree/2.10.1) (2025-03-10)
 ------------------------------------------------------------------------------------------------------------------
 

birdhouse/birdhouse-compose.sh

@@ -23,6 +23,7 @@ VARS='
   $BIRDHOUSE_LOCAL_ENV
   $BIRDHOUSE_LOG_DIR
   $COMPOSE_DIR
+  $COMPOSE_PROJECT_NAME
 '
 
 # list of vars to be substituted in template but they do not have to be set in env.local

birdhouse/components/README.rst

@@ -59,6 +59,15 @@ component directory to the ``BIRDHOUSE_EXTRA_CONF_DIRS`` variable in your local
 
   * component location: ``optional-components/scheduler-job-deploy_raven_testdata``
 
+* Automatically remove old files
+
+  * Removes files generated by other components that may accumulate over time and are not manage automatically by those components.
+
+  * Currently supports removing WPS output files from the ``finch``, ``raven``, and ``hummingbird`` components as well as log files
+    from the ``thredds`` component.
+
+  * component location: ``optional-components/scheduler-job-clean_old_files``
+
 For additional configuration options for all these jobs see the ``env.local.example`` file
 as well as the individual ``default.env`` files in each of the component directories.
 

birdhouse/default.env

@@ -32,6 +32,10 @@ export BIRDHOUSE_LOG_DIR=/var/log/birdhouse
 # Must use single-quote for delayed eval.
 export BIRDHOUSE_FQDN_PUBLIC='${BIRDHOUSE_FQDN}'
 
+# Ensure that the compose project name is set as a variable so that other scripts can refer
+# to it easily
+export COMPOSE_PROJECT_NAME="${COMPOSE_PROJECT_NAME:-birdhouse}"
+
 # Append to DELAYED_EVAL list.
 export DELAYED_EVAL="
   $DELAYED_EVAL

birdhouse/env.local.example

@@ -204,6 +204,47 @@ export GEOSERVER_ADMIN_PASSWORD="${__DEFAULT__GEOSERVER_ADMIN_PASSWORD}"
 # (note: if using 'BIRDHOUSE_DATA_PERSIST_ROOT', it must be defined earlier, either in this file or from 'default.env')
 #export BIRDHOUSE_LOGROTATE_DATA_DIR='${BIRDHOUSE_DATA_PERSIST_ROOT}/logrotate'
 
+# These variables configure the scheduler-job-clean_old_files component
+#
+# For all options below:
+#   - variables that end with SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED will enable the a clean_old_files job for the relevant component if set to 'true'
+#   - variables that end with DELETE_FILES_OLDER_THAN_DAYS set a number of days. Files older than this number of days will be deleted every time
+#     the scheduler-job-clean_old_files scheduler job runs.
+#   - variables that end with DELETE_FILES_TIME_MODE is used by the find command to calculate the age of a file:
+#      - atime: delete files that haven't been accessed in X days
+#      - mtime: delete files that haven't been modified in X days
+#      - ctime: delete files that were created more than X days ago
+#   - variables that end with SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY set the frequency at which the relevant clean old files job should be run. This
+#     value is a string that conforms to the cron schedule format.
+#
+# Delete old WPS output files generated by the finch WPS component
+#export FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+#export FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+#export FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="5 4 * * 0" # weekly on Sunday at 4:05
+#export FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+#
+# Delete old WPS output files generated by the hummingbird WPS component
+#export HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+#export HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+#export HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="10 4 * * 0" # weekly on Sunday at 4:10
+#export HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+#
+# Delete old WPS output files generated by the raven WPS component
+#export RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+#export RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+#export RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="10 4 * * 0" # weekly on Sunday at 4:10
+#export RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+#
+# Delete old log files generated by the thredds component
+#export THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+#export THREDDS_LOGS_DELETE_FILES_TIME_MODE=mtime
+#export THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="20 4 * * 0" # weekly on Sunday at 4:20
+#export THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+
+#############################################################
+# Proxy variables
+#############################################################
+
 # Content of "location /" in file config/proxy/conf.d/all-services.include.template
 # Useful to have a custom homepage.
 # Default:

birdhouse/optional-components/scheduler-job-clean_old_files/.gitignore

@@ -0,0 +1 @@
+config.yml

birdhouse/optional-components/scheduler-job-clean_old_files/blank.config.yml

@@ -0,0 +1 @@
+# this file intentionally contains no content and is mounted to the scheduler directory if a clean_old_files job is not enabled.

birdhouse/optional-components/scheduler-job-clean_old_files/clean-old-files.sh

@@ -0,0 +1,32 @@
+#!/bin/sh
+
+################################################################
+# Example call to delete all files in /tmp last modified longer
+# than 20 days ago
+#
+# $ sh clean-old-files.sh 20 mtime /tmp
+##################################################################
+
+AGE="$1"
+MODE="$2"
+LOCATION="$3"
+
+ACCEPTABLE_MODES='|mtime|ctime|atime|'
+
+if ! echo "$AGE" | grep -q '^[0-9][0-9]*$'; then
+    >&2 echo "AGE argument set to '${AGE}'. It must be an unsigned integer"
+    exit 1
+fi
+
+if [ "${ACCEPTABLE_MODES#*"|${MODE}|"}" = "${ACCEPTABLE_MODES}" ]; then
+    >&2 echo "MODE argument set to '${MODE}'. It must be one of 'mtime', 'ctime', or 'atime'"
+    exit 1
+fi
+
+if [ -z "${LOCATION}" ]; then
+    >&2 echo "LOCATION argument is blank or unset. It must refer to a path on disk."
+    exit 1
+fi
+
+echo "Removing files in ${LOCATION} that have a ${MODE} value greater than ${AGE} days"
+find "${LOCATION}" -type f "-${MODE}" +"${AGE}" -print -delete

birdhouse/optional-components/scheduler-job-clean_old_files/config/finch/config.yml.template

@@ -0,0 +1,9 @@
+- name: clean_old_files_finch
+  comment: clean old WPS output files generated by Finch
+  schedule: '${FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY}'
+  command: 'sh /clean-old-files.sh "${FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}" "${FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}" /wps_outputs/finch'
+  dockerargs: >-
+    --rm --name scheduler-job-clean_old_files_finch
+    --volume ${COMPOSE_DIR}/optional-components/scheduler-job-clean_old_files/clean-old-files.sh:/clean-old-files.sh:ro
+    --volume "${COMPOSE_PROJECT_NAME}_wps_outputs:/wps_outputs:rw"
+  image: '${SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE}'

birdhouse/optional-components/scheduler-job-clean_old_files/config/finch/docker-compose-extra.yml

@@ -0,0 +1,4 @@
+services:
+  scheduler:
+    volumes: 
+      - ./optional-components/scheduler-job-clean_old_files/${__SCHEDULER_JOB_CLEAN_OLD_FILES_FINCH_CONFIG_LOC:-blank.config.yml}:/scheduler-job-configs/clean_old_files_finch.yml:ro}

birdhouse/optional-components/scheduler-job-clean_old_files/config/hummingbird/config.yml.template

@@ -0,0 +1,9 @@
+- name: clean_old_files_hummingbird
+  comment: clean old WPS output files generated by Hummingbird
+  schedule: '${HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY}'
+  command: 'sh /clean-old-files.sh "${HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}" "${HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}" /wps_outputs/hummingbird'
+  dockerargs: >-
+    --rm --name scheduler-job-clean_old_files_hummingbird
+    --volume ${COMPOSE_DIR}/optional-components/scheduler-job-clean_old_files/clean-old-files.sh:/clean-old-files.sh:ro
+    --volume "${COMPOSE_PROJECT_NAME}_wps_outputs:/wps_outputs:rw"
+  image: '${SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE}'

birdhouse/optional-components/scheduler-job-clean_old_files/config/hummingbird/docker-compose-extra.yml

@@ -0,0 +1,4 @@
+services:
+  scheduler:
+    volumes: 
+      - ./optional-components/scheduler-job-clean_old_files/${__SCHEDULER_JOB_CLEAN_OLD_FILES_HUMMINGBIRD_CONFIG_LOC:-blank.config.yml}:/scheduler-job-configs/clean_old_files_hummingbird.yml:ro}

birdhouse/optional-components/scheduler-job-clean_old_files/config/raven/config.yml.template

@@ -0,0 +1,9 @@
+- name: clean_old_files_raven
+  comment: clean old WPS output files generated by Raven
+  schedule: '${RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY}'
+  command: 'sh /clean-old-files.sh "${RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}" "${RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}" /wps_outputs/raven'
+  dockerargs: >-
+    --rm --name scheduler-job-clean_old_files_raven
+    --volume ${COMPOSE_DIR}/optional-components/scheduler-job-clean_old_files/clean-old-files.sh:/clean-old-files.sh:ro
+    --volume "${COMPOSE_PROJECT_NAME}_wps_outputs:/wps_outputs:rw"
+  image: '${SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE}'

birdhouse/optional-components/scheduler-job-clean_old_files/config/raven/docker-compose-extra.yml

@@ -0,0 +1,4 @@
+services:
+  scheduler:
+    volumes: 
+      - ./optional-components/scheduler-job-clean_old_files/${__SCHEDULER_JOB_CLEAN_OLD_FILES_RAVEN_CONFIG_LOC:-blank.config.yml}:/scheduler-job-configs/clean_old_files_raven.yml:ro}

birdhouse/optional-components/scheduler-job-clean_old_files/config/thredds/config.yml.template

@@ -0,0 +1,9 @@
+- name: clean_old_files_thredds
+  comment: clean old log files generated by Thredds
+  schedule: '${THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY}'
+  command: 'sh /clean-old-files.sh "${THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS}" "${THREDDS_LOGS_DELETE_FILES_TIME_MODE}" /thredds'
+  dockerargs: >-
+    --rm --name scheduler-job-clean_old_files_thredds
+    --volume ${COMPOSE_DIR}/optional-components/scheduler-job-clean_old_files/clean-old-files.sh:/clean-old-files.sh:ro
+    --volume "thredds_persistence:/thredds:rw"
+  image: '${SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE}'

birdhouse/optional-components/scheduler-job-clean_old_files/config/thredds/docker-compose-extra.yml

@@ -0,0 +1,4 @@
+services:
+  scheduler:
+    volumes: 
+      - ./optional-components/scheduler-job-clean_old_files/${__SCHEDULER_JOB_CLEAN_OLD_FILES_THREDDS_CONFIG_LOC:-blank.config.yml}:/scheduler-job-configs/clean_old_files_thredds.yml:ro}

birdhouse/optional-components/scheduler-job-clean_old_files/default.env

@@ -0,0 +1,59 @@
+export SCHEDULER_JOB_CLEAN_OLD_FILES_DOCKER=alpine # alpine contains find with -ctime -mtime and -atime options (busybox based containers do not)
+export SCHEDULER_JOB_CLEAN_OLD_FILES_VERSION=3.21
+export SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE='${SCHEDULER_JOB_CLEAN_OLD_FILES_DOCKER}:${SCHEDULER_JOB_CLEAN_OLD_FILES_VERSION}'
+
+if echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'scheduler[[:space:]]*$'; then
+  export FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+  export FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+  export FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="5 4 * * 0" # weekly on Sunday at 4:05
+  export FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+  export __SCHEDULER_JOB_CLEAN_OLD_FILES_FINCH_CONFIG_LOC='$( [ "${FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "config/finch/config.yml" )'
+
+  export HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+  export HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+  export HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="10 4 * * 0" # weekly on Sunday at 4:10
+  export HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+  export __SCHEDULER_JOB_CLEAN_OLD_FILES_HUMMINGBIRD_CONFIG_LOC='$( [ "${HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "config/hummingbird/config.yml" )'
+
+  export RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+  export RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE=atime
+  export RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="15 4 * * 0" # weekly on Sunday at 4:15
+  export RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+  export __SCHEDULER_JOB_CLEAN_OLD_FILES_RAVEN_CONFIG_LOC='$( [ "${RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "config/raven/config.yml" )'
+
+  export THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS=  # unset by default if this job is enabled this must be set to an integer 
+  export THREDDS_LOGS_DELETE_FILES_TIME_MODE=mtime
+  export THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY="20 4 * * 0" # weekly on Sunday at 4:20
+  export THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED=false
+  export __SCHEDULER_JOB_CLEAN_OLD_FILES_THREDDS_CONFIG_LOC='$( [ "${THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "config/thredds/config.yml" )'
+fi
+
+export DELAYED_EVAL="
+  $DELAYED_EVAL
+  SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE
+  __SCHEDULER_JOB_CLEAN_OLD_FILES_FINCH_CONFIG_LOC
+  __SCHEDULER_JOB_CLEAN_OLD_FILES_HUMMINGBIRD_CONFIG_LOC
+  __SCHEDULER_JOB_CLEAN_OLD_FILES_RAVEN_CONFIG_LOC
+  __SCHEDULER_JOB_CLEAN_OLD_FILES_THREDDS_CONFIG_LOC
+"
+
+OPTIONAL_VARS="
+  $OPTIONAL_VARS
+  \$FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS
+  \$FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE
+  \$FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY
+  \$HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS
+  \$HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE
+  \$HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY
+  \$RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS
+  \$RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE
+  \$RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY
+  \$THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS
+  \$THREDDS_LOGS_DELETE_FILES_TIME_MODE
+  \$THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_FREQUENCY
+"
+
+VARS="
+  $VARS
+  \$SCHEDULER_JOB_CLEAN_OLD_FILES_IMAGE
+"

birdhouse/optional-components/scheduler-job-clean_old_files/pre-docker-compose-up.include

@@ -0,0 +1,23 @@
+if echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'scheduler[[:space:]]*$'; then
+  _acceptable_modes='|mtime|ctime|atime|'
+
+  if [ "${FINCH_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'finch[[:space:]]*$'; then
+    echo "$FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS" | grep -q '^[0-9][0-9]*$' || log WARN "FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS variable must be an integer not '${FINCH_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}'. Please set this variable to an integer or disable the finch file cleaning job. This job will not run properly!"
+    [ "${_acceptable_modes#*"|${FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}|"}" = "${_acceptable_modes}" ] && log WARN "FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE variable must be one of 'mtime', 'atime', or 'ctime' not '${FINCH_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}'. Please set this variable to a valid option or disable the finch file cleaning job. This job will not run properly!"
+  fi
+
+  if [ "${HUMMINGBIRD_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'hummingbird[[:space:]]*$'; then
+    echo "$HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS" | grep -q '^[0-9][0-9]*$' || log WARN "HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS variable must be an integer not '${HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}'. Please set this variable to an integer or disable the hummingbird file cleaning job. This job will not run properly!"
+    [ "${_acceptable_modes#*"|${HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}|"}" = "${_acceptable_modes}" ] && log WARN "HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE variable must be one of 'mtime', 'atime', or 'ctime' not '${HUMMINGBIRD_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}'. Please set this variable to a valid option or disable the hummingbird file cleaning job. This job will not run properly!"
+  fi
+
+  if [ "${RAVEN_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'raven[[:space:]]*$'; then
+    echo "$RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS" | grep -q '^[0-9][0-9]*$' || log WARN "RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS variable must be an integer not '${RAVEN_WPS_OUTPUTS_DELETE_FILES_OLDER_THAN_DAYS}'. Please set this variable to an integer or disable the raven file cleaning job. This job will not run properly!"
+    [ "${_acceptable_modes#*"|${RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}|"}" = "${_acceptable_modes}" ] && log WARN "RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE variable must be one of 'mtime', 'atime', or 'ctime' not '${RAVEN_WPS_OUTPUTS_DELETE_FILES_TIME_MODE}'. Please set this variable to a valid option or disable the raven file cleaning job. This job will not run properly!"
+  fi
+
+  if [ "${THREDDS_SCHEDULER_JOB_CLEAN_OLD_FILES_ENABLED}" = "true" ] && echo "${BIRDHOUSE_EXTRA_CONF_DIRS}" | grep -qv 'thredds[[:space:]]*$'; then
+    echo "$THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS" | grep -q '^[0-9][0-9]*$' || log WARN "THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS variable must be an integer not '${THREDDS_LOGS_DELETE_FILES_OLDER_THAN_DAYS}'. Please set this variable to an integer or disable the thredds file cleaning job. This job will not run properly!"
+    [ "${_acceptable_modes#*"|${THREDDS_LOGS_DELETE_FILES_TIME_MODE}|"}" = "${_acceptable_modes}" ] && log WARN "THREDDS_LOGS_DELETE_FILES_TIME_MODE variable must be one of 'mtime', 'atime', or 'ctime' not '${THREDDS_LOGS_DELETE_FILES_TIME_MODE}'. Please set this variable to a valid option or disable the thredds file cleaning job. This job will not run properly!"
+  fi
+fi