diegods/homelabdspbx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove exit command on reload signal (#7749)

Browse Source 
* Remove exit command on reload signal

* Issue reload message on signal reload event

* Add missing return type

* Add explicit casting for int

* Add comment for signal type

* Shutdown after sending reload signal
This commit is contained in:
frytimo
2026-02-20 23:27:29 -04:00
committed by GitHub
parent 3487abad83
commit 683477fdcf
2 changed files with 40 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/classes/service.php
+20 -36
View File
@@ -122,7 +122,7 @@ abstract class service {
* calling another method from the constructor) will fail to register the signal handlers.</p>
*/
protected function __construct() {
openlog('[php][' . self::class . ']', LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
openlog('[php][' . static::class . ']', LOG_CONS | LOG_NDELAY | LOG_PID, LOG_DAEMON);
}
/**
@@ -134,13 +134,15 @@ abstract class service {
/**
* Sends a shutdown signal to the running process.
*
* @return bool True if the signals were sent successfully, false if no service is running
*/
public static function send_shutdown() {
public static function send_shutdown(): bool {
if (self::is_any_running()) {
self::send_signal(SIGTERM);
} else {
die("Service Not Started\n");
return self::send_signal(15); // SIGTERM
}
return false;
}
/**
@@ -166,30 +168,17 @@ abstract class service {
* 'service' command as root user. It is possible to start the
* service with user www-data and then the web UI would in fact
* be able to send the reload signal to the running service.</p>
*
* @param int $posix_signal The POSIX signal to send.
*
* @return bool True if the signal was sent successfully, false otherwise.
*/
public static function send_signal($posix_signal) {
$signal_name = "";
switch ($posix_signal) {
case 1: //SIGHUP
case 10: //SIGUSR1
$signal_name = "Reload";
break;
case 12: //SIGUSR2
case 15: //SIGTERM
$signal_name = "Shutdown";
break;
}
public static function send_signal(int $posix_signal): bool {
$pid = self::get_service_pid();
if ($pid === false) {
self::log("service not running", LOG_EMERG);
} else {
if (posix_kill((int)$pid, $posix_signal)) {
echo "Sent $signal_name\n";
} else {
$err = posix_strerror(posix_get_last_error());
echo "Failed to send $signal_name: $err\n";
}
if ($pid !== false && posix_kill((int)$pid, (int)$posix_signal)) {
return true;
}
return false;
}
/**
@@ -227,15 +216,13 @@ abstract class service {
/**
* Sends a reload signal to running services, or exits if no service is running.
*
* @return void
* @return bool True if the reload signal was sent successfully, false if no service is running
*/
public static function send_reload() {
public static function send_reload(): bool {
if (self::is_any_running()) {
self::send_signal(10);
} else {
die("Service Not Started\n");
return self::send_signal(10); // SIGUSR1
}
exit();
return false;
}
/**
@@ -452,10 +439,6 @@ abstract class service {
}
}
//
//
//
/**
* Returns an array of base command options.
*
@@ -505,6 +488,7 @@ abstract class service {
$help_options[$index]['short_description'] = '-r';
$help_options[$index]['long_description'] = '--reload';
$help_options[$index]['functions'][] = 'send_reload';
$help_options[$index]['functions'][] = 'shutdown';
$index++;
$help_options[$index]['short_option'] = 'd:';
$help_options[$index]['long_option'] = 'debug:';