dennii/Web-Page-Performance-Test
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/Web-Page-Performance-Test.git synced 2026-04-17 20:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
DeNNiiInc
2025-12-27 22:29:15 +11:00
parent f253b8678f
commit aebd9934e5
5 changed files with 211 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
PROXMOX_DEPLOY_TEMPLATE.md
View File

@@ -273,85 +273,92 @@ 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.
### 6.1 Create robust auto-sync script
```bash ```bash
cat > /var/www/your-app-name/auto-sync.sh << 'EOF' cat > /var/www/your-app-name/auto-sync.sh << 'EOF'
#!/bin/bash #!/bin/bash
set -e # Configuration
APP_NAME="your-app-name" APP_NAME="your-app-name"
APP_DIR="/var/www/$APP_NAME" APP_DIR="/var/www/$APP_NAME"
LOG_FILE="/var/log/$APP_NAME-autosync.log" 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 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" LOCAL=$(git rev-parse HEAD)
REMOTE=$(git rev-parse origin/main)
if [ "$LOCAL" != "$REMOTE" ]; then
log "🔄 Changes detected! Pulling..."
git pull origin main >> "$LOG_FILE" 2>&1
if git diff --name-only "$LOCAL" "$REMOTE" | grep -q "package.json"; then
log "📦 package.json changed. Installing dependencies..."
npm install --production >> "$LOG_FILE" 2>&1 || exit 1
fi fi
# Restart the service log "🔄 Restarting service..."
log "🔄 Restarting $APP_NAME service..." systemctl restart "$APP_NAME"
systemctl restart "$APP_NAME" 2>&1 | tee -a "$LOG_FILE" log "✅ Sync complete."
# Wait and check status
sleep 2
if systemctl is-active --quiet "$APP_NAME"; then
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 fi
log "✅ Auto-sync completed!"
log "========================================="
EOF EOF
# Make executable
chmod +x /var/www/your-app-name/auto-sync.sh chmod +x /var/www/your-app-name/auto-sync.sh
# Create log file
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
Create the Service (What to run):
```bash
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
```
Create the Timer (When to run):
```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 ```bash
# Add cron job (every 5 minutes) systemctl daemon-reload
echo "*/5 * * * * cd /var/www/your-app-name && /bin/bash auto-sync.sh" | crontab - systemctl enable --now your-app-name-sync.timer
systemctl list-timers --all
# Verify it was added
crontab -l
``` ```
--- ---

66
auto-sync-robust.sh Normal file
View File

@@ -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

38
deploy-sync-upgrade.ps1 Normal file
View File

@@ -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
}

10
web-page-performance-test-sync.service Normal file
View File

@@ -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

10
web-page-performance-test-sync.timer Normal file
View File

@@ -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