maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

check only for existing .conf files when trying to find out whether a fpm pool config directory is empty; fixes #543

Browse Source 
Signed-off-by: Michael Kaufmann <michael.kaufmann@aixit.com>
This commit is contained in:
Michael Kaufmann
2018-05-06 14:38:18 +02:00
parent 6f9187d1bb
commit 67b95a301b
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -66,9 +66,8 @@ class apache extends HttpConfigBase
foreach ($restart_cmds as $restart_cmd) {
// check whether the config dir is empty (no domains uses this daemon)
// so we need to create a dummy
$fsi = new \FilesystemIterator($restart_cmd['config_dir']);
$isDirEmpty = !$fsi->valid();
if ($isDirEmpty) {
$_conffiles = glob(makeCorrectFile($restart_cmd['config_dir'] . "/*.conf"));
if ($_conffiles === false || empty($_conffiles)) {
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'apache::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.');
phpinterface_fpm::createDummyPool($restart_cmd['config_dir']);
}

5
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -66,9 +66,8 @@ class lighttpd extends HttpConfigBase
foreach ($restart_cmds as $restart_cmd) {
// check whether the config dir is empty (no domains uses this daemon)
// so we need to create a dummy
$fsi = new \FilesystemIterator($restart_cmd['config_dir']);
$isDirEmpty = !$fsi->valid();
if ($isDirEmpty) {
$_conffiles = glob(makeCorrectFile($restart_cmd['config_dir'] . "/*.conf"));
if ($_conffiles === false || empty($_conffiles)) {
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'lighttpd::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.');
phpinterface_fpm::createDummyPool($restart_cmd['config_dir']);
}

5
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -81,9 +81,8 @@ class nginx extends HttpConfigBase
foreach ($restart_cmds as $restart_cmd) {
// check whether the config dir is empty (no domains uses this daemon)
// so we need to create a dummy
$fsi = new \FilesystemIterator($restart_cmd['config_dir']);
$isDirEmpty = !$fsi->valid();
if ($isDirEmpty) {
$_conffiles = glob(makeCorrectFile($restart_cmd['config_dir'] . "/*.conf"));
if ($_conffiles === false || empty($_conffiles)) {
$this->logger->logAction(CRON_ACTION, LOG_INFO, 'nginx::reload: fpm config directory "' . $restart_cmd['config_dir'] . '" is empty. Creating dummy.');
phpinterface_fpm::createDummyPool($restart_cmd['config_dir']);
}