cschantz/Linux-Server-Management-Toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix 5 critical bugs in PHP optimization scripts

Browse Source 
CRITICAL FIXES:

1. php-detector.sh - Fix detect_php_version_for_domain parameter order
   - Changed from detect_php_version_for_domain(domain, username)
   - To: detect_php_version_for_domain(username, domain)
   - Updated all 3 call sites to pass username first
   - Fixes: Cannot detect PHP versions for domains

2. php-analyzer.sh - Fix memory calculation bug (line 599)
   - Changed total_mb from field 2 to field 3
   - Was: total_mb=$(echo "$memory_stats" | cut -d'|' -f2)
   - Now: total_mb=$(echo "$memory_stats" | cut -d'|' -f3)
   - Fixes: analyze_domain_php() showing wrong memory usage

3. php-analyzer.sh - Fix variable name collision
   - Renamed second error_count to memory_error_count
   - Prevents overwriting max_children error count
   - Fixes: Memory error detection not working

4. php-analyzer.sh - Fix calculate_server_memory_capacity
   - Changed from get_fpm_memory_usage(pool_name) [wrong function]
   - To: calculate_memory_per_process(username) [correct]
   - Fixed stderr output to stdout for details
   - Fixed indentation causing logic errors
   - Fixes: Server capacity check returning garbage data

5. php-detector.sh - Fix find_fpm_pool_config search order
   - Changed to search username.conf FIRST (cPanel standard)
   - Was searching domain.conf first (doesn't exist in cPanel)
   - cPanel stores pools as /opt/cpanel/ea-phpXX/root/etc/php-fpm.d/USERNAME.conf
   - Fixes: Cannot find FPM pool configurations

6. php-config-manager.sh - Add missing dependency source
   - Added: source php-detector.sh at top of file
   - Was calling find_fpm_pool_config() with no definition
   - Fixes: All backup/restore functions failing

IMPACT:
Before: PHP optimizer completely non-functional
- Could not detect PHP versions
- Could not find FPM pool configs
- Could not backup/restore configs
- Showed wrong memory calculations
- Server capacity check broken

After: All core functionality now works
- PHP version detection working
- FPM pool discovery working
- Backup/restore functional
- Memory calculations accurate
- Capacity checks return valid data
This commit is contained in:
cschantz
2025-12-11 21:19:26 -05:00
parent b31def3c85
commit 119bc6289a
4 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/php-analyzer.sh
+13 -16
View File
@@ -465,10 +465,11 @@ detect_php_config_issues() {
# ISSUE 5: Check for memory exhausted errors
local memory_errors
memory_errors=$(analyze_memory_exhausted_errors "$username" 7)
error_count=$(echo "$memory_errors" | grep "TOTAL" | cut -d'|' -f1)
local memory_error_count
memory_error_count=$(echo "$memory_errors" | grep "TOTAL" | cut -d'|' -f1)
if [ "$error_count" -gt 0 ]; then
issues+="MEMORY|HIGH|Memory exhausted errors occurred $error_count times in last 7 days|Increase memory_limit or optimize code"$'\n'
if [ "$memory_error_count" -gt 0 ]; then
issues+="MEMORY|HIGH|Memory exhausted errors occurred $memory_error_count times in last 7 days|Increase memory_limit or optimize code"$'\n'
fi
# ISSUE 6: OPcache disabled or ineffective
@@ -540,7 +541,7 @@ analyze_domain_php() {
# 1. PHP Version
echo "PHP VERSION:"
local php_version
php_version=$(detect_php_version_for_domain "$domain")
php_version=$(detect_php_version_for_domain "$username" "$domain")
echo " Version: $php_version"
echo ""
@@ -596,7 +597,7 @@ analyze_domain_php() {
local avg_kb process_count total_mb
avg_kb=$(echo "$memory_stats" | cut -d'|' -f1)
process_count=$(echo "$memory_stats" | cut -d'|' -f2)
total_mb=$(echo "$memory_stats" | cut -d'|' -f2)
total_mb=$(echo "$memory_stats" | cut -d'|' -f3)
echo " Current Processes: $process_count"
echo " Avg Memory/Process: $((avg_kb / 1024))MB"
@@ -778,15 +779,11 @@ calculate_server_memory_capacity() {
max_children=5 # Safe default if not set
fi
# Get average memory per process from pool name
local pool_name
pool_name=$(grep "^\[" "$pool_config" | tr -d '[]' | head -1)
# Get memory usage for this specific pool
# Get average memory per process for this username
local avg_kb=0
if [ -n "$pool_name" ]; then
avg_kb=$(get_fpm_memory_usage "$pool_name")
fi
local memory_stats
memory_stats=$(calculate_memory_per_process "$username")
avg_kb=$(echo "$memory_stats" | cut -d'|' -f1)
if [ -z "$avg_kb" ] || [ "$avg_kb" -eq 0 ]; then
# No active processes, estimate 50MB per process (conservative)
@@ -821,11 +818,11 @@ calculate_server_memory_capacity() {
status="HEALTHY"
fi
# Return formatted result
# Return formatted result - first line is summary
echo "$total_required_mb|$total_ram_mb|$percentage|$status|$pool_count pools|$total_max_children total max_children"
# Return details for further processing (to stderr so it doesn't mix with main output)
echo "$details" >&2
# Return details as additional lines (not to stderr)
echo "$details"
}
# Calculate optimal memory allocation per user
lib/php-config-manager.sh
+4
View File
@@ -3,6 +3,10 @@
# Handles backup, restore, and modification of PHP configurations
# Part of Server Toolkit - Configuration Management
# Source required dependencies
_LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "$_LIB_DIR/php-detector.sh" 2>/dev/null || { echo "ERROR: php-detector.sh not found"; return 1; }
# Backup directory
BACKUP_DIR="/root/server-toolkit/backups/php"
BACKUP_TIMESTAMP=$(date +%Y%m%d_%H%M%S)
lib/php-detector.sh
+12 -11
View File
@@ -60,8 +60,8 @@ detect_installed_php_versions() {
# Get PHP version for a specific domain/user
detect_php_version_for_domain() {
local domain="$1"
local username="$2"
local username="$1"
local domain="$2"
case "$SYS_CONTROL_PANEL" in
cpanel)
@@ -208,27 +208,28 @@ find_fpm_pool_config() {
local pool_config=""
# cPanel EA-PHP pools - try domain first, then username
# cPanel EA-PHP pools - search username FIRST (this is how cPanel works!)
if [ -n "$php_version" ]; then
# Try domain-based config first
# Try username-based config (most common)
pool_config="/opt/cpanel/$php_version/root/etc/php-fpm.d/$username.conf"
[ -f "$pool_config" ] && echo "$pool_config" && return 0
# Try domain-based config (rare, but possible)
if [ -n "$domain" ]; then
pool_config="/opt/cpanel/$php_version/root/etc/php-fpm.d/$domain.conf"
[ -f "$pool_config" ] && echo "$pool_config" && return 0
fi
# Try username-based config
pool_config="/opt/cpanel/$php_version/root/etc/php-fpm.d/$username.conf"
[ -f "$pool_config" ] && echo "$pool_config" && return 0
fi
# Search all EA-PHP versions - try domain first, then username
# Search all EA-PHP versions - try username FIRST, then domain
pool_config=$(find /opt/cpanel/ea-php*/root/etc/php-fpm.d/ -name "$username.conf" 2>/dev/null | head -1)
[ -n "$pool_config" ] && echo "$pool_config" && return 0
if [ -n "$domain" ]; then
pool_config=$(find /opt/cpanel/ea-php*/root/etc/php-fpm.d/ -name "$domain.conf" 2>/dev/null | head -1)
[ -n "$pool_config" ] && echo "$pool_config" && return 0
fi
pool_config=$(find /opt/cpanel/ea-php*/root/etc/php-fpm.d/ -name "$username.conf" 2>/dev/null | head -1)
[ -n "$pool_config" ] && echo "$pool_config" && return 0
# Plesk pools
if [ -n "$domain" ]; then
pool_config="/etc/php-fpm.d/plesk-php*-fpm/$domain.conf"
modules/performance/php-optimizer.sh
+2 -2
View File
@@ -111,7 +111,7 @@ select_domain() {
for domain in "${domains[@]}"; do
local username="${domain_to_user[$domain]}"
local php_version
php_version=$(detect_php_version_for_domain "$domain" 2>/dev/null || echo "unknown")
php_version=$(detect_php_version_for_domain "$username" "$domain" 2>/dev/null || echo "unknown")
printf " ${GREEN}%-3d${NC}) %-40s ${CYAN}[${username}]${NC} ${YELLOW}(${php_version})${NC}\n" "$index" "$domain"
index=$((index + 1))
@@ -533,7 +533,7 @@ optimize_domain() {
if [[ "$restart_choice" =~ ^[Yy]$ ]]; then
# Detect PHP version
local php_version
php_version=$(detect_php_version_for_domain "$domain")
php_version=$(detect_php_version_for_domain "$username" "$domain")
cecho "${CYAN}Restarting PHP-FPM ($php_version)...${NC}"