diff --git a/scripts/jobs/cron_tasks.inc.http.10.apache.php b/scripts/jobs/cron_tasks.inc.http.10.apache.php index 63ca8091..9236c21e 100644 --- a/scripts/jobs/cron_tasks.inc.http.10.apache.php +++ b/scripts/jobs/cron_tasks.inc.http.10.apache.php @@ -1368,22 +1368,26 @@ class apache $configdir = $this->settings['phpfpm']['configdir']; $phpfpm_file_dirhandle = opendir($this->settings['phpfpm']['configdir']); - while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) - { - if(is_array($known_phpfpm_files) - && $phpfpm_filename != '.' - && $phpfpm_filename != '..' - && !in_array($phpfpm_filename, $known_phpfpm_files) - && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) - { - fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); - $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); - unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); + if ($phpfpm_file_dirhandle !== false) { + + while (false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) { + + if (is_array($known_phpfpm_files) + && $phpfpm_filename != '.' + && $phpfpm_filename != '..' + && !in_array($phpfpm_filename, $known_phpfpm_files) + && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)) + ) { + fwrite($this->debugHandler, ' apache::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); + $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); + unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); } - if(!is_array($known_phpfpm_files)) - { + if (!is_array($known_phpfpm_files)) { $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!"); } + } + } else { + $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")"); } } } diff --git a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php index 18a3506b..80fb0b9f 100644 --- a/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php +++ b/scripts/jobs/cron_tasks.inc.http.20.lighttpd.php @@ -1038,21 +1038,28 @@ class lighttpd $configdir = $this->settings['phpfpm']['configdir']; $phpfpm_file_dirhandle = opendir($this->settings['phpfpm']['configdir']); - - while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) - { - if($phpfpm_filename != '.' - && $phpfpm_filename != '..' - && !in_array($phpfpm_filename, $known_phpfpm_files) - && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) - { + + if ($phpfpm_file_dirhandle !== false) { + + while (false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) { + + if (is_array($known_phpfpm_files) + && $phpfpm_filename != '.' + && $phpfpm_filename != '..' + && !in_array($phpfpm_filename, $known_phpfpm_files) + && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)) + ) { fwrite($this->debugHandler, ' lighttpd::wipeOutOldConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); } + if (!is_array($known_phpfpm_files)) { + $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!"); + } + } + } else { + $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")"); } } } } - -?> diff --git a/scripts/jobs/cron_tasks.inc.http.30.nginx.php b/scripts/jobs/cron_tasks.inc.http.30.nginx.php index 596a304e..2a218d84 100644 --- a/scripts/jobs/cron_tasks.inc.http.30.nginx.php +++ b/scripts/jobs/cron_tasks.inc.http.30.nginx.php @@ -1046,18 +1046,27 @@ class nginx $configdir = $this->settings['phpfpm']['configdir']; $phpfpm_file_dirhandle = opendir($this->settings['phpfpm']['configdir']); - - while(false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) - { - if($phpfpm_filename != '.' - && $phpfpm_filename != '..' - && !in_array($phpfpm_filename, $known_phpfpm_files) - && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename))) - { + + if ($phpfpm_file_dirhandle !== false) { + + while (false !== ($phpfpm_filename = readdir($phpfpm_file_dirhandle))) { + + if (is_array($known_phpfpm_files) + && $phpfpm_filename != '.' + && $phpfpm_filename != '..' + && !in_array($phpfpm_filename, $known_phpfpm_files) + && file_exists(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)) + ) { fwrite($this->debugHandler, ' nginx::wipeOutOldVhostConfigs: unlinking PHP5-FPM ' . $phpfpm_filename . "\n"); $this->logger->logAction(CRON_ACTION, LOG_NOTICE, 'unlinking ' . $phpfpm_filename); unlink(makeCorrectFile($this->settings['phpfpm']['configdir'] . '/' . $phpfpm_filename)); } + if (!is_array($known_phpfpm_files)) { + $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM Configs Not written!!"); + } + } + } else { + $this->logger->logAction(CRON_ACTION, LOG_WARNING, "WARNING!! PHP-FPM configuration path could not be read (".$this->settings['phpfpm']['configdir'].")"); } } }