Add a way to run manually

Author: CannonLock

export.sh

@@ -1,36 +1,43 @@
 #!/bin/sh
 
-# This file is run on successful log rotation
+if [ -z "${LOG_PATH:-}" ]; then
+    echo "LOG_PATH is not set."
+    exit 1
+fi
 
-# Define the log file and the rotated log file
-ROTATED_LOG_FILE="$LOG_PATH.1"
+# If from logrotate, the file to export is the rotated file ( .1 ), otherwise it's the current log file ( .log )
+if [ "${FROM_LOGROTATE:-}" = "1" ]; then
+  RUN_MODE="logrotate"
+  EXPORT_LOG_FILE="$LOG_PATH.1"
+else
+  RUN_MODE="manual"
+  EXPORT_LOG_FILE="$LOG_PATH"
+fi
 
 # Check if the rotated log file exists
-if [ -f "$ROTATED_LOG_FILE" ]; then
-    echo "Log rotation successful. Processing the rotated log file."
+if [ -f "$EXPORT_LOG_FILE" ]; then
+    if [ "$RUN_MODE" = "logrotate" ]; then
+        # Only needed after rotation, so traefik reopens the active log file.
+        TRAEFIK_PID=$(pgrep traefik)
 
-    # Find the PID of the traefik process
-    TRAEFIK_PID=$(pgrep traefik)
+        if [ -n "$TRAEFIK_PID" ]; then
+            kill -USR1 "$TRAEFIK_PID"
+            echo "Sent USR1 signal to traefik process with PID $TRAEFIK_PID"
+        else
+            echo "Traefik process not found."
+        fi
 
-    # Check if the PID was found
-    if [ -n "$TRAEFIK_PID" ]; then
-        # Send USR1 signal to the traefik process
-        kill -USR1 "$TRAEFIK_PID"
-        echo "Sent USR1 signal to traefik process with PID $TRAEFIK_PID"
-    else
-        echo "Traefik process not found."
+        # Give traefik time to reopen before continuing.
+        sleep 10
     fi
 
-    # Make sure traefik has time to reopen the log file before we try to compress it
-    sleep 10
-
     # Get the uploaded log file name
     TIMESTAMP=$(date +"%Y%m%dT%H00Z") # Cron runs on the hour, so we round to the hour
-    HASH_SUFFIX=$(cksum "$ROTATED_LOG_FILE" | cut -d ' ' -f 1 | cut -c1-8)
+    HASH_SUFFIX=$(cksum "$EXPORT_LOG_FILE" | cut -d ' ' -f 1 | cut -c1-8)
     S3_KEY="${TIMESTAMP}_HASH${HASH_SUFFIX}_access.log.zst"
 
     # Compress the rotated log before upload
-    if ! zstd -19 -q -c "$ROTATED_LOG_FILE" > "$S3_KEY"; then
+    if ! zstd -19 -q -c "$EXPORT_LOG_FILE" > "$S3_KEY"; then
         echo "Failed to compress rotated log file."
         exit 1
     fi
@@ -49,6 +56,10 @@ if [ -f "$ROTATED_LOG_FILE" ]; then
 
     echo "Upload to S3 successful."
 else
-    echo "Rotated log file not found."
+    if [ "$RUN_MODE" = "logrotate" ]; then
+        echo "Rotated log file not found: $EXPORT_LOG_FILE"
+    else
+        echo "Log file not found: $EXPORT_LOG_FILE"
+    fi
     exit 1
 fi

logrotate.sh

@@ -10,7 +10,7 @@ cat <<EOF > /tmp/logrotate.conf
     compress
     delaycompress
     postrotate
-        /app/export.sh
+        FROM_LOGROTATE=1 /app/export.sh
     endscript
 }
 EOF