OpenSource/PVE-mods
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix ups not working

Browse Source
This commit is contained in:
Meliox 2026-01-10 23:25:24 +01:00
parent 80e73081b6
commit e860220605
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pve-mod.pm
View File

@ -995,32 +995,26 @@ sub _get_ups_status {
my ($ups_name) = @_; my ($ups_name) = @_;
# upsc upsname[@hostname[:port]] # upsc upsname[@hostname[:port]]
my $cmd = "upsc $ups_name 2>/dev/null"; _debug(__LINE__, "Collecting UPS status for $ups_name");
_debug(__LINE__, "Running command: $cmd");
# Execute command and capture output # Execute command and capture output
my $output = `$cmd`; my $output = `/usr/bin/upsc $ups_name 2>/dev/null`;
_debug(__LINE__, "upsc command output collected");
my $exit_code = $? >> 8;
_debug(__LINE__, "upsc command exited with code $exit_code"); unless (defined $output) {
_debug(__LINE__, "Failed to execute upsc");
if ($exit_code != 0) { return encode_json({ error => "Failed to execute upsc" });
_debug(__LINE__, "upsc command failed with exit code $exit_code"); }
return encode_json({ error => "Failed to execute upsc for $ups_name" });
# Check if we got any output
unless (defined $output && length($output) > 0) {
_debug(__LINE__, "No output from upsc for $ups_name");
return encode_json({ error => "No data from UPS $ups_name" });
} }
_debug(__LINE__, "upsc command executed successfully");
# Convert upsc output to nested hash structure # Convert upsc output to nested hash structure
my $ups_data = _parse_upsc_output($output); my $ups_data = _parse_upsc_output($output);
_debug(__LINE__, "Parsed upsc output for $ups_name");
# Check if we got any data # Check if we got any parsed data
unless (keys %$ups_data) { unless (keys %$ups_data) {
_debug(__LINE__, "No data received from upsc for $ups_name"); _debug(__LINE__, "No data received from upsc for $ups_name");
return encode_json({ error => "No data from UPS $ups_name" }); return encode_json({ error => "No data from UPS $ups_name" });
@ -1031,8 +1025,6 @@ sub _get_ups_status {
$ups_name => $ups_data $ups_name => $ups_data
}; };
_debug(__LINE__, "Successfully parsed UPS data for $ups_name");
# Return as pretty JSON # Return as pretty JSON
return JSON->new->pretty->canonical->encode($result); return JSON->new->pretty->canonical->encode($result);
} }
@ -1496,6 +1488,12 @@ sub _start_ups_collector {
_debug(__LINE__, "Starting UPS collector"); _debug(__LINE__, "Starting UPS collector");
# Check if upsc is available
unless (-x '/usr/bin/upsc') {
_debug(__LINE__, "upsc not available, skipping UPS collector startup");
return;
}
# Check if UPS is configured # Check if UPS is configured
unless (defined $ups_device && $ups_device->{ups_name}) { unless (defined $ups_device && $ups_device->{ups_name}) {
_debug(__LINE__, "No UPS configured, skipping collector startup"); _debug(__LINE__, "No UPS configured, skipping collector startup");