Added PHP-FPM Restart mode. See System > Interface config > Web > PHP-FPM reload mode. Fixes #4816

Till Brehm · Till Brehm · commit 3b0f4a4d8c30 · 2019-07-05T18:28:08.000+02:00
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
@@ -116,6 +116,7 @@ overquota_db_notify_admin=y
 overquota_db_notify_client=y
 overquota_notify_onok=n
 logging=yes
+php_fpm_reload_mode=reload
 
 [dns]
 bind_user=root
diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
@@ -1376,6 +1376,14 @@
 				1 => 'y'
 			)
 		),
+		'php_fpm_reload_mode' => array(
+			'datatype' => 'VARCHAR',
+			'formtype' => 'SELECT',
+			'default' => 'reload',
+			'value' => array('reload' => 'Reload', 'restart' => 'Restart'),
+			'width' => '40',
+			'maxlength' => '255'
+		),
 		//#################################
 		// ENDE Datatable fields
 		//#################################
diff --git a/interface/web/admin/lib/lang/de_server_config.lng b/interface/web/admin/lib/lang/de_server_config.lng
@@ -295,4 +295,5 @@ $wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
 $wb['php_default_name_txt'] = 'Beschreibung Standard PHP';
 $wb['php_default_name_error_empty'] = 'Beschreibung Standard PHP ist leer.';
 $wb['error_mailbox_message_size_txt'] = 'Mailboxgröße muss gleich oder größer als max. Nachrichtengröße sein.';
+$wb['php_fpm_reload_mode_txt'] = 'PHP-FPM reload Modus';
 ?>
diff --git a/interface/web/admin/lib/lang/en_server_config.lng b/interface/web/admin/lib/lang/en_server_config.lng
@@ -296,4 +296,5 @@ $wb['log_retention_error_ispositive'] = 'Log retention must be a number > 0';
 $wb['php_default_name_txt'] = 'Description Default PHP-Version';
 $wb['php_default_name_error_empty'] = 'Description Default PHP-Version must not be empty';
 $wb['error_mailbox_message_size_txt'] = 'Mailbox size must be larger or equal to message size';
+$wb['php_fpm_reload_mode_txt'] = 'PHP-FPM reload mode';
 ?>
diff --git a/interface/web/admin/templates/server_config_web_edit.htm b/interface/web/admin/templates/server_config_web_edit.htm
@@ -299,6 +299,12 @@ <h4 class="panel-title">
                         {tmpl_var name='php_fpm_incron_reload'}
                     </div>
                 </div>
+				<div class="form-group">
+                <label class="col-sm-3 control-label">{tmpl_var name='php_fpm_reload_mode_txt'}</label>
+                <div class="col-sm-9"><select name="php_fpm_reload_mode" id="php_fpm_reload_mode" class="form-control">
+                        {tmpl_var name='php_fpm_reload_mode'}
+                    </select></div>
+            </div>
 	  <!-- End content -->
 	  </div>
 	</div>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -3058,6 +3058,8 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 
 		$app->uses("getconf");
 		$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
+		
+		$php_fpm_reload_mode = ($web_config['php_fpm_reload_mode'] == 'reload')?'reload':'restart';
 
 		if($data['new']['php'] != 'php-fpm'){
 			if(@is_file($pool_dir.$pool_name.'.conf')){
@@ -3066,9 +3068,9 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 			}
 			if($data['old']['php'] == 'php-fpm'){
 				if(!$default_php_fpm){
-					$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
+					$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
 				} else {
-					$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
+					$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
 				}
 			}
 			//if($reload == true) $app->services->restartService('php-fpm','reload');
@@ -3205,7 +3207,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 			if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
 				$app->system->unlink($default_pool_dir.$pool_name.'.conf');
 				$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);
-				$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
+				$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
 			}
 		}
 		$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"]);
@@ -3217,17 +3219,17 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 					if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
 						$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
 						$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);
-						$app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);
+						$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);
 					}
 				}
 			}
 		}
 		// Reload current PHP-FPM after all others
 		sleep(1);
 		if(!$default_php_fpm){
-			$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
+			$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
 		} else {
-			$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
+			$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
 		}
 
 		//$reload = true;
@@ -3238,6 +3240,11 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
 	//* Delete the PHP-FPM pool configuration file
 	private function php_fpm_pool_delete ($data, $web_config) {
 		global $app, $conf;
+		
+		$app->uses("getconf");
+		$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
+		
+		$php_fpm_reload_mode = ($web_config['php_fpm_reload_mode'] == 'reload')?'reload':'restart';
 
 		if(trim($data['old']['fastcgi_php_version']) != '' && $data['old']['php'] == 'php-fpm'){
 			$default_php_fpm = false;
@@ -3271,7 +3278,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
 			if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
 				$app->system->unlink($default_pool_dir.$pool_name.'.conf');
 				$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);
-				$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
+				$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
 			}
 		}
 		$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']);
@@ -3283,7 +3290,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
 					if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
 						$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');
 						$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);
-						$app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);
+						$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);
 					}
 				}
 			}
@@ -3292,9 +3299,9 @@ private function php_fpm_pool_delete ($data, $web_config) {
 		// Reload current PHP-FPM after all others
 		sleep(1);
 		if(!$default_php_fpm){
-			$app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);
+			$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);
 		} else {
-			$app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
+			$app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -3058,6 +3058,8 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3058`	`3058`
`3059`	`3059`	`$app->uses("getconf");`
`3060`	`3060`	`$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');`
	`3061`	`+`
	`3062`	`+ $php_fpm_reload_mode = ($web_config['php_fpm_reload_mode'] == 'reload')?'reload':'restart';`
`3061`	`3063`
`3062`	`3064`	`if($data['new']['php'] != 'php-fpm'){`
`3063`	`3065`	`if(@is_file($pool_dir.$pool_name.'.conf')){`
`@@ -3066,9 +3068,9 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3066`	`3068`	`}`
`3067`	`3069`	`if($data['old']['php'] == 'php-fpm'){`
`3068`	`3070`	`if(!$default_php_fpm){`
`3069`		`- $app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);`
	`3071`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);`
`3070`	`3072`	`} else {`
`3071`		`- $app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
	`3073`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
`3072`	`3074`	`}`
`3073`	`3075`	`}`
`3074`	`3076`	`//if($reload == true) $app->services->restartService('php-fpm','reload');`
`@@ -3205,7 +3207,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3205`	`3207`	`if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {`
`3206`	`3208`	`$app->system->unlink($default_pool_dir.$pool_name.'.conf');`
`3207`	`3209`	`$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);`
`3208`		`- $app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
	`3210`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
`3209`	`3211`	`}`
`3210`	`3212`	`}`
`3211`	`3213`	`$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"]);`
`@@ -3217,17 +3219,17 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3217`	`3219`	`if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {`
`3218`	`3220`	`$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');`
`3219`	`3221`	`$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);`
`3220`		`- $app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);`
	`3222`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);`
`3221`	`3223`	`}`
`3222`	`3224`	`}`
`3223`	`3225`	`}`
`3224`	`3226`	`}`
`3225`	`3227`	`// Reload current PHP-FPM after all others`
`3226`	`3228`	`sleep(1);`
`3227`	`3229`	`if(!$default_php_fpm){`
`3228`		`- $app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);`
	`3230`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);`
`3229`	`3231`	`} else {`
`3230`		`- $app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
	`3232`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
`3231`	`3233`	`}`
`3232`	`3234`
`3233`	`3235`	`//$reload = true;`
`@@ -3238,6 +3240,11 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,`
`3238`	`3240`	`//* Delete the PHP-FPM pool configuration file`
`3239`	`3241`	`private function php_fpm_pool_delete ($data, $web_config) {`
`3240`	`3242`	`global $app, $conf;`
	`3243`	`+`
	`3244`	`+ $app->uses("getconf");`
	`3245`	`+ $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');`
	`3246`	`+`
	`3247`	`+ $php_fpm_reload_mode = ($web_config['php_fpm_reload_mode'] == 'reload')?'reload':'restart';`
`3241`	`3248`
`3242`	`3249`	`if(trim($data['old']['fastcgi_php_version']) != '' && $data['old']['php'] == 'php-fpm'){`
`3243`	`3250`	`$default_php_fpm = false;`
`@@ -3271,7 +3278,7 @@ private function php_fpm_pool_delete ($data, $web_config) {`
`3271`	`3278`	`if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {`
`3272`	`3279`	`$app->system->unlink($default_pool_dir.$pool_name.'.conf');`
`3273`	`3280`	`$app->log('Removed PHP-FPM config file: '.$default_pool_dir.$pool_name.'.conf', LOGLEVEL_DEBUG);`
`3274`		`- $app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
	`3281`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
`3275`	`3282`	`}`
`3276`	`3283`	`}`
`3277`	`3284`	`$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']);`
`@@ -3283,7 +3290,7 @@ private function php_fpm_pool_delete ($data, $web_config) {`
`3283`	`3290`	`if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {`
`3284`	`3291`	`$app->system->unlink($php_version['php_fpm_pool_dir'].$pool_name.'.conf');`
`3285`	`3292`	`$app->log('Removed PHP-FPM config file: '.$php_version['php_fpm_pool_dir'].$pool_name.'.conf', LOGLEVEL_DEBUG);`
`3286`		`- $app->services->restartService('php-fpm', 'reload:'.$php_version['php_fpm_init_script']);`
	`3293`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$php_version['php_fpm_init_script']);`
`3287`	`3294`	`}`
`3288`	`3295`	`}`
`3289`	`3296`	`}`
`@@ -3292,9 +3299,9 @@ private function php_fpm_pool_delete ($data, $web_config) {`
`3292`	`3299`	`// Reload current PHP-FPM after all others`
`3293`	`3300`	`sleep(1);`
`3294`	`3301`	`if(!$default_php_fpm){`
`3295`		`- $app->services->restartService('php-fpm', 'reload:'.$custom_php_fpm_init_script);`
	`3302`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$custom_php_fpm_init_script);`
`3296`	`3303`	`} else {`
`3297`		`- $app->services->restartService('php-fpm', 'reload:'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
	`3304`	`+ $app->services->restartService('php-fpm', $php_fpm_reload_mode.':'.$conf['init_scripts'].'/'.$web_config['php_fpm_init_script']);`
`3298`	`3305`	`}`
`3299`	`3306`	`}`
`3300`	`3307`