Add high-reliability 30s auto-sync configuration (Systemd Timer)

PROXMOX_DEPLOY_TEMPLATE.md

@@ -273,86 +273,93 @@ curl -I http://localhost
 
 ---
 
-## 🔄 Step 6: Setup Auto-Sync (Every 5 Minutes)
+## 🔄 Step 6: Setup Auto-Sync (Every 30 Seconds)
  
-### 6.1 Create auto-sync script
+ We use **Systemd Timers** instead of Cron because they support sub-minute intervals and prevent overlapping execution.
  
-```bash
+ ### 6.1 Create robust auto-sync script
-cat > /var/www/your-app-name/auto-sync.sh << 'EOF'
-#!/bin/bash
  
-set -e
+ ```bash
+ cat > /var/www/your-app-name/auto-sync.sh << 'EOF'
+ #!/bin/bash
  
-APP_NAME="your-app-name"
+ # Configuration
-APP_DIR="/var/www/$APP_NAME"
+ APP_NAME="your-app-name"
-LOG_FILE="/var/log/$APP_NAME-autosync.log"
+ APP_DIR="/var/www/$APP_NAME"
+ LOG_FILE="/var/log/$APP_NAME-autosync.log"
+ LOCK_FILE="/var/lock/$APP_NAME-sync.lock"
  
-log() {
+ # Singleton execution with flock (prevents overlap)
-    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG_FILE"
+ exec 9>"$LOCK_FILE"
-}
+ if ! flock -n 9; then
-
-log "========================================="
-log "Starting auto-sync check..."
-
-cd "$APP_DIR" || exit 1
-
-# Fetch latest from remote
-git fetch origin main 2>&1 | tee -a "$LOG_FILE"
-
-# Check if local is behind remote
-LOCAL=$(git rev-parse HEAD)
-REMOTE=$(git rev-parse origin/main)
-
-if [ "$LOCAL" = "$REMOTE" ]; then
-    log "✅ Already up to date. No changes detected."
      exit 0
-fi
+ fi
  
-log "🔄 Changes detected! Pulling updates..."
+ log() { echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >> "$LOG_FILE"; }
  
-# Pull changes
+ cd "$APP_DIR" || exit 1
-git pull origin main 2>&1 | tee -a "$LOG_FILE"
  
-# Install/update dependencies if package.json changed
+ # Fetch and check
-if git diff --name-only $LOCAL $REMOTE | grep -q "package.json"; then
+ if ! git fetch origin main --quiet; then exit 1; fi
-    log "📦 package.json changed. Running npm install..."
-    npm install 2>&1 | tee -a "$LOG_FILE"
-fi
  
-# Restart the service
+ LOCAL=$(git rev-parse HEAD)
-log "🔄 Restarting $APP_NAME service..."
+ REMOTE=$(git rev-parse origin/main)
-systemctl restart "$APP_NAME" 2>&1 | tee -a "$LOG_FILE"
  
-# Wait and check status
+ if [ "$LOCAL" != "$REMOTE" ]; then
-sleep 2
+     log "🔄 Changes detected! Pulling..."
-if systemctl is-active --quiet "$APP_NAME"; then
+     git pull origin main >> "$LOG_FILE" 2>&1
-    log "✅ Service restarted successfully!"
-else
-    log "❌ WARNING: Service may have failed to start!"
-    systemctl status "$APP_NAME" --no-pager 2>&1 | tee -a "$LOG_FILE"
-fi
      
-log "✅ Auto-sync completed!"
+     if git diff --name-only "$LOCAL" "$REMOTE" | grep -q "package.json"; then
-log "========================================="
+         log "📦 package.json changed. Installing dependencies..."
-EOF
+         npm install --production >> "$LOG_FILE" 2>&1 || exit 1
+     fi
      
-# Make executable
+     log "🔄 Restarting service..."
-chmod +x /var/www/your-app-name/auto-sync.sh
+     systemctl restart "$APP_NAME"
+     log "✅ Sync complete."
+ fi
+ EOF
  
-# Create log file
+ chmod +x /var/www/your-app-name/auto-sync.sh
-touch /var/log/your-app-name-autosync.log
+ ```
-chmod 644 /var/log/your-app-name-autosync.log
-```
  
-### 6.2 Add to crontab
+ ### 6.2 Create Systemd Timer Units
  
-```bash
+ Create the Service (What to run):
-# Add cron job (every 5 minutes)
+ ```bash
-echo "*/5 * * * * cd /var/www/your-app-name && /bin/bash auto-sync.sh" | crontab -
+ cat > /etc/systemd/system/your-app-name-sync.service << 'EOF'
+ [Unit]
+ Description=Auto-sync Service
+ [Service]
+ Type=oneshot
+ ExecStart=/var/www/your-app-name/auto-sync.sh
+ User=root
+ EOF
+ ```
  
-# Verify it was added
+ Create the Timer (When to run):
-crontab -l
+ ```bash
-```
+ cat > /etc/systemd/system/your-app-name-sync.timer << 'EOF'
+ [Unit]
+ Description=Run auto-sync every 30 seconds
+ 
+ [Timer]
+ OnBootSec=1min
+ OnUnitActiveSec=30s
+ Unit=your-app-name-sync.service
+ 
+ [Install]
+ WantedBy=timers.target
+ EOF
+ ```
+ 
+ ### 6.3 Enable the Timer
+ 
+ ```bash
+ systemctl daemon-reload
+ systemctl enable --now your-app-name-sync.timer
+ systemctl list-timers --all
+ ```
 
 ---
 

auto-sync-robust.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# Configuration
+APP_NAME="web-page-performance-test"
+APP_DIR="/var/www/$APP_NAME"
+LOG_FILE="/var/log/$APP_NAME-autosync.log"
+LOCK_FILE="/var/lock/$APP_NAME-sync.lock"
+
+# Singleton execution with flock
+exec 9>"$LOCK_FILE"
+if ! flock -n 9; then
+    # Lock is busy, skip this run (logging optional to avoid spam)
+    exit 0
+fi
+
+log() {
+    echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" >> "$LOG_FILE"
+}
+
+# Ensure we are in the correct directory
+cd "$APP_DIR" || { log "❌ Error: Could not change to $APP_DIR"; exit 1; }
+
+# Fetch remote updates
+if ! git fetch origin main --quiet; then
+    log "❌ Error: Git fetch failed"
+    exit 1
+fi
+
+LOCAL=$(git rev-parse HEAD)
+REMOTE=$(git rev-parse origin/main)
+
+if [ "$LOCAL" = "$REMOTE" ]; then
+    # No changes, exit silently
+    exit 0
+fi
+
+log "🔄 Changes detected! Local: ${LOCAL:0:7} -> Remote: ${REMOTE:0:7}"
+
+# Pull changes
+if ! git pull origin main; then
+    log "❌ Error: Git pull failed"
+    exit 1
+fi
+
+# Check for dependency changes
+RESTART_NEEDED=false
+if git diff --name-only "$LOCAL" "$REMOTE" | grep -q "package.json"; then
+    log "📦 package.json changed. Running npm install..."
+    if npm install --production; then
+        RESTART_NEEDED=true
+    else
+        log "❌ Error: npm install failed"
+    fi
+else
+    RESTART_NEEDED=true
+fi
+
+# Restart service if needed
+if [ "$RESTART_NEEDED" = true ]; then
+    log "🔄 Restarting service..."
+    if systemctl restart "$APP_NAME"; then
+        log "✅ Service restarted successfully"
+    else
+        log "❌ Error: Failed to restart service"
+    fi
+fi

deploy-sync-upgrade.ps1

@@ -0,0 +1,38 @@
+$Server = "172.16.69.219"
+$User = "root"
+$Pass = "Q4dv!Z`$nCe#`$OT&h"
+$RemotePath = "/var/www/web-page-performance-test"
+
+function Send-File {
+    param($LocalFile, $RemotePath)
+    echo "📄 Sending $LocalFile..."
+    Get-Content -Raw $LocalFile | plink -batch -pw "$Pass" "$User@$Server" "cat > $RemotePath"
+    if ($LASTEXITCODE -ne 0) { throw "Failed to send $LocalFile" }
+}
+
+try {
+    # Copy files via plink pipe (more reliable than pscp here)
+    Send-File ".\auto-sync-robust.sh" "$RemotePath/auto-sync.sh"
+    Send-File ".\web-page-performance-test-sync.service" "/etc/systemd/system/web-page-performance-test-sync.service"
+    Send-File ".\web-page-performance-test-sync.timer" "/etc/systemd/system/web-page-performance-test-sync.timer"
+
+    # Configure server
+    echo "⚙️ Configuring Systemd Timer on server..."
+    $Commands = @(
+        "chmod +x $RemotePath/auto-sync.sh",
+        "crontab -l | grep -v 'auto-sync.sh' | crontab -", # Remove old cron job
+        "systemctl daemon-reload",
+        "systemctl enable web-page-performance-test-sync.timer",
+        "systemctl start web-page-performance-test-sync.timer",
+        "systemctl status web-page-performance-test-sync.timer --no-pager",
+        "echo '✅ Systemd Timer Upgrade Complete!'"
+    )
+    $CommandStr = $Commands -join " && "
+
+    plink -batch -pw "$Pass" "$User@$Server" $CommandStr
+
+}
+catch {
+    echo "❌ Error: $_"
+    exit 1
+}

web-page-performance-test-sync.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=Auto-sync Web Page Performance Test from GitHub
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/var/www/web-page-performance-test/auto-sync.sh
+User=root
+StandardOutput=append:/var/log/web-page-performance-test-autosync.log
+StandardError=append:/var/log/web-page-performance-test-autosync.log

web-page-performance-test-sync.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run auto-sync every 30 seconds
+
+[Timer]
+OnBootSec=1min
+OnUnitActiveSec=30s
+Unit=web-page-performance-test-sync.service
+
+[Install]
+WantedBy=timers.target