config reloader setup

Author: denis256

nginx-f1/nginx-reloader.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
-set -euo pipefail
+set -uo pipefail
 
 # script to watch changes in WATCH_DIR and reload nginx on .conf file changes
 
 WATCH_DIR="${WATCH_DIR:-/etc/nginx}"
 RELOADER_LOG="${RELOADER_LOG:-/var/log/nginx/reloader.log}"
 RELOADER_DELAY="${RELOADER_DELAY:-2}"
-FAIL_COUNT=0
-MAX_FAILS=5
+LAST_HASH=""
 
 log() {
  local msg="[$(date '+%Y-%m-%d %H:%M:%S')] $1"
@@ -20,6 +19,11 @@ error_exit() {
  exit 1
 }
 
+# compute hash of all .conf files
+compute_hash() {
+ find "${WATCH_DIR}" -name '*.conf' -type f -exec md5sum {} \; 2>/dev/null | sort | md5sum | awk '{print $1}'
+}
+
 # pre-flight checks
 command -v inotifywait >/dev/null 2>&1 || error_exit "inotifywait not found, install inotify-tools"
 command -v nginx >/dev/null 2>&1 || error_exit "nginx not found"
@@ -29,56 +33,38 @@ command -v nginx >/dev/null 2>&1 || error_exit "nginx not found"
 LOG_DIR=$(dirname "${RELOADER_LOG}")
 [[ -d "${LOG_DIR}" ]] || mkdir -p "${LOG_DIR}"
 
-log "Starting nginx-reloader"
-log "Config: WATCH_DIR=${WATCH_DIR} DELAY=${RELOADER_DELAY}s LOG=${RELOADER_LOG}"
+# compute initial hash
+LAST_HASH=$(compute_hash)
+
+log "Starting nginx-reloader v3"
+log "Config: WATCH_DIR=${WATCH_DIR} DELAY=${RELOADER_DELAY}s"
+log "Initial config hash: ${LAST_HASH}"
 
 while true
 do
  sleep "${RELOADER_DELAY}"
 
- # run inotifywait and capture both output and exit code
- set +e
- OUTPUT=$(inotifywait --recursive --include '\.conf$' --format '%w%f %e' \
-   -e create -e modify -e delete -e move "${WATCH_DIR}" 2>&1)
- EXIT_CODE=$?
- set -e
+ # wait for any file event in watch dir
+ inotifywait --recursive --format '%w%f' \
+   -e create -e modify -e delete -e move \
+   "${WATCH_DIR}" >/dev/null 2>&1 || true
 
- # handle inotifywait errors
- if [[ ${EXIT_CODE} -ne 0 ]]; then
-  FAIL_COUNT=$((FAIL_COUNT + 1))
-  log "inotifywait failed (exit=${EXIT_CODE}, count=${FAIL_COUNT}): ${OUTPUT}"
-  if [[ ${FAIL_COUNT} -ge ${MAX_FAILS} ]]; then
-   error_exit "inotifywait failed ${MAX_FAILS} times, giving up"
-  fi
-  sleep 5
+ # compute new hash of all .conf files
+ NEW_HASH=$(compute_hash)
+
+ # skip if hash unchanged
+ if [[ "${NEW_HASH}" == "${LAST_HASH}" ]]; then
   continue
  fi
 
- # reset fail count on success
- FAIL_COUNT=0
-
- # parse output - format is "path event"
- FILE=$(echo "${OUTPUT}" | awk '{print $1}')
- EVENT=$(echo "${OUTPUT}" | awk '{print $2}')
-
- # skip if empty
- [[ -z "${FILE}" ]] && continue
-
- # only process .conf files (double check)
- [[ "${FILE}" != *.conf ]] && continue
-
- log "Detected: ${FILE} (${EVENT})"
+ log "Config changed: ${LAST_HASH} -> ${NEW_HASH}"
+ LAST_HASH="${NEW_HASH}"
 
  # test nginx config
- set +e
- TEST_OUTPUT=$(nginx -t 2>&1)
- TEST_CODE=$?
- set -e
-
- if [[ ${TEST_CODE} -eq 0 ]]; then
+ if nginx -t 2>/dev/null; then
   log "Config valid, reloading nginx"
-  nginx -s reload || log "Reload failed"
+  nginx -s reload 2>/dev/null || log "Reload command failed"
  else
-  log "Config test failed: ${TEST_OUTPUT}"
+  log "Config test failed, skipping reload"
  fi
 done