lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

system: defer start of lighttpd on newwanip event #6351

Browse Source 
Looks like improvements in 23.1.4 made the problem worse, indicating
that the direction this is going is a bit doubtful.  Instead, funnel
the restart through configd to reach some state of serialization
similar to what filter_configure() is doing.

While here move the service definition to the correct file.
This commit is contained in:
Franco Fichtner 2023-03-22 07:58:00 +01:00
parent bbbed94a93
commit 33ad50456a
2 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/etc/inc/plugins.inc.d/core.inc
View File

@ -119,16 +119,6 @@ function core_services()
'name' => 'syslog-ng',
);
$services[] = array(
'pidfile' => '/var/run/lighty-webConfigurator.pid',
'description' => gettext('Web GUI'),
'php' => array(
'restart' => array('webgui_configure_delayed')
),
'name' => 'webgui',
'locked' => true,
);
return $services;
}

42
src/etc/inc/plugins.inc.d/webgui.inc
View File

@ -30,37 +30,57 @@
function webgui_configure()
{
return array(
'early' => array('webgui_configure_do'),
'local' => array('webgui_configure_do'),
'newwanip' => array('webgui_configure_do:2'),
'webgui' => array('webgui_configure_do'),
);
return [
'early' => ['webgui_configure_do'],
'local' => ['webgui_configure_do'],
'newwanip' => ['webgui_configure_do:2'],
'webgui' => ['webgui_configure_do'],
];
}
function webgui_configure_delayed()
function webgui_services()
{
configd_run('webgui restart 3', true);
return [[
'pidfile' => '/var/run/lighty-webConfigurator.pid',
'description' => gettext('Web GUI'),
'php' => ['restart' => ['webgui_configure_defer']],
'name' => 'webgui',
'locked' => true,
]];
}
function webgui_configure_defer($verbose = false, $sleep = 3)
{
service_log('Starting web GUI...', $verbose);
configdp_run('webgui restart', [$sleep], true);
service_log("deferred.\n", $verbose);
}
function webgui_configure_do($verbose = false, $interface = '')
{
global $config;
$interfaces = array();
$interfaces = [];
if (!empty($config['system']['webgui']['interfaces'])) {
$interfaces = explode(',', $config['system']['webgui']['interfaces']);
/* place loopback with good IPv4 first for server.bind */
array_unshift($interfaces, 'lo0');
}
if (!empty($interface) && !in_array($interface, $interfaces)) {
/* 'newwanip' configuration is the only event to take second argument */
if (!empty($interface)) {
if (in_array($interface, $interfaces)) {
/* funnel through configd to avoid race conditions */
webgui_configure_defer($verbose, 0);
}
/* nothing else to do */
return;
}
service_log('Starting web GUI...', $verbose);
$listeners = count($interfaces) ? array() : array('0.0.0.0', '::');
$listeners = count($interfaces) ? [] : ['0.0.0.0', '::'];
foreach (interfaces_addresses($interfaces) as $tmpaddr => $info) {
if ($info['scope']) {