mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-05 17:20:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2170 from unraid/fix-diags

Browse Source 
fix: diagnostics: ensure commands run with UTF-8 charset
This commit is contained in:
tom mortensen
2025-04-24 13:41:55 -07:00
committed by GitHub
parent 664daff306 fef99b9df7
commit d687dcec86
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
emhttp/plugins/dynamix/scripts/diagnostics
View File

@@ -26,6 +26,7 @@ $cli = empty($zip);
$docroot ??= ($_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp');
require_once "$docroot/webGui/include/Helpers.php";
require_once "$docroot/webGui/include/Wrappers.php";
require_once "$docroot/webGui/include/publish.php";
if (is_file('/boot/syslinux/syslinux.cfg')) {
@@ -45,15 +46,34 @@ $pools = pools_filter($disks);
require_once "$docroot/webGui/include/CustomMerge.php";
function write(...$messages){
foreach ($messages as $message) publish('diagnostics', $message);
foreach ($messages as $message) {
publish('diagnostics', $message);
}
}
// Add error logging function
function log_error($message, $command = '') {
global $diag;
$error_log = "/$diag/logs/diagnostics.error.log";
$timestamp = date('Y-m-d H:i:s');
$log_message = "[$timestamp] $message";
if ($command) {
$log_message .= " (Command: $command)";
}
file_put_contents($error_log, $log_message . "\n", FILE_APPEND);
}
// Modify run function to include error logging
function run($cmd, &$save=null, $timeout=30) {
global $cli,$diag;
// output command for display
write($cmd);
// execute command with timeout of 30s
exec("LC_ALL=en_US.UTF-8 timeout -s9 $timeout $cmd", $save);
return implode("\n", $save);
exec("LC_ALL=en_US.UTF-8 timeout -s9 $timeout $cmd 2>&1", $save, $return_code);
if ($return_code !== 0) {
log_error("Command failed with return code $return_code", $cmd);
}
return implode("\n",$save);
}
function newline($file) {