Skip to content

[Bug] Fix placeholder erorr messages #1965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexjustesen merged 1 commit into from
Jan 4, 2025
Merged

[Bug] Fix placeholder erorr messages #1965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions app/Helpers/Ookla.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ class Ookla
public static function getErrorMessage(ProcessFailedException $exception): string
{
$messages = explode(PHP_EOL, $exception->getMessage());
$errorMessages = [];

// Extract only the "message" part from each JSON error message
$errorMessages = array_map(function ($message) {
foreach ($messages as $message) {
$decoded = json_decode($message, true);
if (json_last_error() === JSON_ERROR_NONE && isset($decoded['message'])) {
return $decoded['message'];
$errorMessages[] = $decoded['message'];
}
}

// Placeholder for invalid JSON or missing "message"
return 'An unexpected error occurred while running the Ookla CLI.';
}, $messages);

// Filter out empty messages and concatenate
$errorMessage = implode(' | ', array_filter($errorMessages));
// If no valid messages, use the placeholder
if (empty($errorMessages)) {
$errorMessages[] = 'An unexpected error occurred while running the Ookla CLI.';
}

return $errorMessage;
// Remove duplicates and concatenate
return implode(' | ', array_unique($errorMessages));
}

public static function getConfigServers(): ?array
Expand Down