update player with wachdog and intro

This commit is contained in:
2025-11-22 10:26:20 +02:00
parent 68ed5b8534
commit 744681bb20
5 changed files with 276 additions and 33 deletions

158
start.sh
View File

@@ -1,58 +1,152 @@
#!/bin/bash
# Kivy Signage Player Startup Script
# This script activates the virtual environment and starts the player
# Kivy Signage Player Startup Script with Watchdog
# This script monitors and auto-restarts the player if it crashes
# Get the directory where this script is located
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
echo "=========================================="
echo "Starting Kivy Signage Player"
echo "=========================================="
echo ""
# Configuration
MAX_RETRIES=999999 # Effectively unlimited retries
RESTART_DELAY=5 # Seconds to wait before restart
HEALTH_CHECK_INTERVAL=30 # Seconds between health checks
HEARTBEAT_FILE="$SCRIPT_DIR/.player_heartbeat"
STOP_FLAG_FILE="$SCRIPT_DIR/.player_stop_requested"
LOG_FILE="$SCRIPT_DIR/player_watchdog.log"
# Function to log messages
log_message() {
echo "[$(date '+%Y-%m-%d %H:%M:%S')] $1" | tee -a "$LOG_FILE"
}
# Function to check if player is healthy
check_health() {
# Check if heartbeat file exists and is recent (within last 60 seconds)
if [ -f "$HEARTBEAT_FILE" ]; then
local last_update=$(stat -c %Y "$HEARTBEAT_FILE" 2>/dev/null || echo 0)
local current_time=$(date +%s)
local diff=$((current_time - last_update))
if [ $diff -lt 60 ]; then
return 0 # Healthy
else
log_message "⚠️ Player heartbeat stale (${diff}s old)"
return 1 # Unhealthy
fi
else
# If heartbeat file doesn't exist yet, assume player is starting
return 0
fi
}
# Cleanup function
cleanup() {
log_message "🛑 Watchdog received stop signal"
rm -f "$HEARTBEAT_FILE"
rm -f "$STOP_FLAG_FILE"
exit 0
}
# Trap signals for graceful shutdown
trap cleanup SIGINT SIGTERM
log_message "=========================================="
log_message "🚀 Kivy Signage Player Watchdog Started"
log_message "=========================================="
log_message "Project directory: $SCRIPT_DIR"
log_message "Max retries: Unlimited"
log_message "Restart delay: ${RESTART_DELAY}s"
log_message ""
# Remove old stop flag if exists (fresh start)
rm -f "$STOP_FLAG_FILE"
# Change to the project directory
cd "$SCRIPT_DIR"
echo "Project directory: $SCRIPT_DIR"
# Check if virtual environment exists
if [ -d ".venv" ]; then
echo "Activating virtual environment..."
log_message "✓ Virtual environment found"
source .venv/bin/activate
echo "✓ Virtual environment activated"
else
echo "Warning: Virtual environment not found at .venv/"
echo "Creating virtual environment..."
log_message "⚠️ Creating virtual environment..."
python3 -m venv .venv
source .venv/bin/activate
echo "Installing dependencies..."
log_message "📦 Installing dependencies..."
pip3 install -r requirements.txt
echo "✓ Virtual environment created and dependencies installed"
log_message "✓ Virtual environment ready"
fi
echo ""
# Check if configuration exists
if [ ! -f "config/app_config.json" ]; then
echo "=========================================="
echo "⚠ WARNING: Configuration file not found!"
echo "=========================================="
echo ""
echo "Please configure the player before running:"
echo " 1. Copy config/app_config.json.example to config/app_config.json"
echo " 2. Edit the configuration file with your server details"
echo ""
read -p "Press Enter to continue anyway, or Ctrl+C to exit..."
echo ""
log_message "⚠️ WARNING: Configuration file not found!"
log_message "Player may not function correctly without configuration"
fi
# Change to src directory and start the application
echo "Starting application..."
echo "=========================================="
echo ""
# Main watchdog loop
retry_count=0
while true; do
retry_count=$((retry_count + 1))
log_message ""
log_message "=========================================="
log_message "▶️ Starting player (attempt #${retry_count})"
log_message "=========================================="
# Clean old heartbeat
rm -f "$HEARTBEAT_FILE"
# Start the player
cd "$SCRIPT_DIR/src"
python3 main.py &
PLAYER_PID=$!
log_message "Player PID: $PLAYER_PID"
# Monitor the player
while true; do
sleep $HEALTH_CHECK_INTERVAL
# Check if process is still running
if ! kill -0 $PLAYER_PID 2>/dev/null; then
log_message "❌ Player process crashed or stopped (PID: $PLAYER_PID)"
break
fi
# Check health via heartbeat
if ! check_health; then
log_message "❌ Player health check failed - may be frozen"
kill $PLAYER_PID 2>/dev/null
sleep 2
kill -9 $PLAYER_PID 2>/dev/null
break
fi
# Player is healthy, continue monitoring
done
# Player stopped or crashed
# Check if user requested intentional exit
if [ -f "$STOP_FLAG_FILE" ]; then
log_message "✋ Stop flag detected - user requested exit via password"
log_message "Watchdog will NOT restart the player"
log_message "To restart, run ./start.sh again"
rm -f "$HEARTBEAT_FILE"
break
fi
log_message "⏳ Waiting ${RESTART_DELAY}s before restart..."
sleep $RESTART_DELAY
# Cleanup any zombie processes
pkill -9 -f "python3 main.py" 2>/dev/null
done
cd src
python3 main.py
log_message ""
log_message "=========================================="
log_message "Watchdog stopped"
log_message "=========================================="
# Deactivate virtual environment when app exits
# Deactivate virtual environment (this line is never reached in watchdog mode)
deactivate