Skip to content

Commit 2315b81

Browse files
author
Till Brehm
committed
Merge branch '6581-nginx-plugin-phpfpm-reload-mode-support' into 'develop'
Use PHP-FPM reload mode from server configuration when nginx_plugin ask for a... Closes #6581 See merge request ispconfig/ispconfig3!1811
2 parents 28ade7e + f81d3f2 commit 2315b81

File tree

1 file changed

+11
-10
lines changed

1 file changed

+11
-10
lines changed

‎server/plugins-available/nginx_plugin.inc.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2880,6 +2880,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
28802880

28812881
$app->uses("getconf");
28822882
$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
2883+
$php_fpm_reload_mode = ($web_config['php_fpm_reload_mode'] == 'reload')?'reload':'restart';
28832884

28842885
// HHVM => PHP-FPM-Fallback
28852886
if($data['new']['php'] != 'php-fpm' && $data['new']['php'] != 'hhvm'){
@@ -2889,9 +2890,9 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
28892890
}
28902891
if($data['old']['php'] != 'no'){
28912892
if(!$default_php_fpm){
2892-
$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
2893+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
28932894
} else {
2894-
$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
2895+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
28952896
}
28962897
}
28972898
return;
@@ -3039,7 +3040,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
30393040
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
30403041
$app->system->unlink($default_pool_dir.$pool_name.'.conf');
30413042
$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);
3042-
$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
3043+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
30433044
}
30443045
}
30453046
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $conf["server_id"]);
@@ -3051,17 +3052,17 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
30513052
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
30523053
$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
30533054
$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);
3054-
$app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);
3055+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);
30553056
}
30563057
}
30573058
}
30583059
}
30593060
// Reload current PHP-FPM after all others
30603061
sleep(1);
30613062
if(!$default_php_fpm){
3062-
$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
3063+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
30633064
} else {
3064-
$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
3065+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
30653066
}
30663067
}
30673068

@@ -3104,7 +3105,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
31043105
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
31053106
$app->system->unlink($default_pool_dir.$pool_name.'.conf');
31063107
$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);
3107-
$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
3108+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
31083109
}
31093110
}
31103111
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $data['old']['server_id']);
@@ -3116,7 +3117,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
31163117
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
31173118
$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
31183119
$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);
3119-
$app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);
3120+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);
31203121
}
31213122
}
31223123
}
@@ -3125,9 +3126,9 @@ private function php_fpm_pool_delete ($data, $web_config) {
31253126
// Reload current PHP-FPM after all others
31263127
sleep(1);
31273128
if(!$default_php_fpm){
3128-
$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
3129+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
31293130
} else {
3130-
$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
3131+
$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
31313132
}
31323133
}
31333134

0 commit comments

Comments
 (0)