Thomas/Piwigo_Bratonien_Tools
1
0
Fork 0
mirror of https://github.com/Terranom674/Piwigo_Bratonien_Tools.git synced 2026-09-19 18:44:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix connector last and next run status detection

Browse Source
This commit is contained in:
Terranom674
2026-08-17 11:50:35 +02:00
parent 3aa2b9ae3e
commit 25745b18e0
1 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
include/nc_connector_system.inc.php
View File

@@ -17,7 +17,8 @@ function bratonien_tools_nc_connector_systemctl_value(array $args)
1 => array('pipe', 'w'), 1 => array('pipe', 'w'),
2 => array('pipe', 'w'), 2 => array('pipe', 'w'),
); );
$process = @proc_open($command, $spec, $pipes); $environment = array_merge($_ENV, array('LC_ALL'=>'C', 'LANG'=>'C'));
$process = @proc_open($command, $spec, $pipes, null, $environment);
if (!is_resource($process)) if (!is_resource($process))
{ {
return ''; return '';
@@ -41,9 +42,19 @@ function bratonien_tools_nc_connector_parse_systemd_time($value)
return $parsed === false ? 0 : (int)$parsed; return $parsed === false ? 0 : (int)$parsed;
} }
function bratonien_tools_nc_connector_monotonic_to_timestamp($microseconds) function bratonien_tools_nc_connector_monotonic_to_timestamp($value)
{ {
if (!preg_match('/^([0-9]+)(?:us)?$/', trim((string)$microseconds), $matches)) $value = trim((string)$value);
if ($value === '' || $value === '0' || strtolower($value) === 'n/a')
{
return 0;
}
if (preg_match('/^([0-9]+)(?:us)?$/', $value, $matches))
{
$next_boot_seconds = ((float)$matches[1]) / 1000000;
}
else
{ {
return 0; return 0;
} }
@@ -54,9 +65,7 @@ function bratonien_tools_nc_connector_monotonic_to_timestamp($microseconds)
return 0; return 0;
} }
$next_boot_seconds = ((float)$matches[1]) / 1000000; $remaining = $next_boot_seconds - (float)$uptime_match[1];
$uptime_seconds = (float)$uptime_match[1];
$remaining = $next_boot_seconds - $uptime_seconds;
if ($remaining < -1) if ($remaining < -1)
{ {
return 0; return 0;
@@ -65,6 +74,26 @@ function bratonien_tools_nc_connector_monotonic_to_timestamp($microseconds)
return (int)round(time() + max(0, $remaining)); return (int)round(time() + max(0, $remaining));
} }
function bratonien_tools_nc_connector_next_from_timer_list($timer)
{
$line = bratonien_tools_nc_connector_systemctl_value(array(
'list-timers', '--all', '--no-pager', '--no-legend', $timer,
));
if ($line === '')
{
return 0;
}
$first_line = trim((string)strtok($line, "\n"));
if (preg_match('/^(\S+\s+\d{4}-\d{2}-\d{2}\s+\d{2}:\d{2}:\d{2}\s+\S+)/', $first_line, $matches))
{
$parsed = strtotime($matches[1]);
return $parsed === false ? 0 : (int)$parsed;
}
return 0;
}
function bratonien_tools_nc_connector_last_status(array $connections) function bratonien_tools_nc_connector_last_status(array $connections)
{ {
foreach ($connections as $connection) foreach ($connections as $connection)
@@ -93,9 +122,8 @@ function bratonien_tools_nc_connector_last_status(array $connections)
continue; continue;
} }
$timestamp = (int)($decoded['timestamp'] ?? 0);
return array( return array(
'timestamp' => $timestamp, 'timestamp' => (int)($decoded['timestamp'] ?? 0),
'state' => (string)($decoded['state'] ?? ''), 'state' => (string)($decoded['state'] ?? ''),
'message' => (string)($decoded['message'] ?? ''), 'message' => (string)($decoded['message'] ?? ''),
); );
@@ -118,6 +146,11 @@ function bratonien_tools_nc_connector_system_status(array $connections = array()
$next_timestamp = bratonien_tools_nc_connector_monotonic_to_timestamp($next_monotonic_raw); $next_timestamp = bratonien_tools_nc_connector_monotonic_to_timestamp($next_monotonic_raw);
} }
if ($next_timestamp <= 0)
{
$next_timestamp = bratonien_tools_nc_connector_next_from_timer_list($timer);
}
$active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $timer)); $active = bratonien_tools_nc_connector_systemctl_value(array('is-active', $timer));
$enabled = bratonien_tools_nc_connector_systemctl_value(array('is-enabled', $timer)); $enabled = bratonien_tools_nc_connector_systemctl_value(array('is-enabled', $timer));