Zander671/Waybar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(systemd-failed-units): guard label/tooltip format against bad config

Browse Source 
A malformed user format or tooltip-format (unknown {placeholder}) made
fmt::format throw fmt::format_error out of update(). Wrap the label and
tooltip format calls in try/catch that warn once and fall back to a safe
label / skip the tooltip instead of taking the module down.
This commit is contained in:
Alex
2026-07-05 10:13:24 +02:00
parent 34522b4ccd
commit fc6a567974
1 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/systemd_failed_units.cpp
+32 -11
View File
@@ -281,21 +281,42 @@ auto SystemdFailedUnits::update() -> void {
last_status_ = overall_state_; last_status_ = overall_state_;
setLabelMarkup(fmt::format( // A malformed user format/tooltip-format (e.g. an unknown {placeholder}) makes fmt throw a
fmt::runtime(nr_failed_ == 0 ? format_ok_ : format_), fmt::arg("nr_failed", nr_failed_), // fmt::format_error; catch it so a bad config warns once instead of taking update() down.
fmt::arg("nr_failed_system", nr_failed_system_), fmt::arg("nr_failed_user", nr_failed_user_), try {
fmt::arg("system_state", system_state_), fmt::arg("user_state", user_state_), setLabelMarkup(fmt::format(
fmt::arg("overall_state", overall_state_))); fmt::runtime(nr_failed_ == 0 ? format_ok_ : format_), fmt::arg("nr_failed", nr_failed_),
fmt::arg("nr_failed_system", nr_failed_system_),
fmt::arg("nr_failed_user", nr_failed_user_), fmt::arg("system_state", system_state_),
fmt::arg("user_state", user_state_), fmt::arg("overall_state", overall_state_)));
} catch (const std::exception& e) {
static bool labelWarned = false;
if (!labelWarned) {
spdlog::warn("systemd-failed-units: invalid format, using fallback: {}", e.what());
labelWarned = true;
}
setLabelMarkup(fmt::format("{} failed", nr_failed_));
}
if (tooltipEnabled()) { if (tooltipEnabled()) {
std::string failed_list = BuildTooltipFailedList(); std::string failed_list = BuildTooltipFailedList();
auto tooltip_template = overall_state_ == "ok" ? tooltip_format_ok_ : tooltip_format_; auto tooltip_template = overall_state_ == "ok" ? tooltip_format_ok_ : tooltip_format_;
if (!tooltip_template.empty()) { if (!tooltip_template.empty()) {
setTooltipMarkup(fmt::format( try {
fmt::runtime(tooltip_template), fmt::arg("nr_failed", nr_failed_), setTooltipMarkup(fmt::format(
fmt::arg("nr_failed_system", nr_failed_system_), fmt::runtime(tooltip_template), fmt::arg("nr_failed", nr_failed_),
fmt::arg("nr_failed_user", nr_failed_user_), fmt::arg("system_state", system_state_), fmt::arg("nr_failed_system", nr_failed_system_),
fmt::arg("user_state", user_state_), fmt::arg("overall_state", overall_state_), fmt::arg("nr_failed_user", nr_failed_user_), fmt::arg("system_state", system_state_),
fmt::arg("failed_units_list", failed_list))); fmt::arg("user_state", user_state_), fmt::arg("overall_state", overall_state_),
fmt::arg("failed_units_list", failed_list)));
} catch (const std::exception& e) {
static bool tooltipWarned = false;
if (!tooltipWarned) {
spdlog::warn("systemd-failed-units: invalid tooltip-format, skipping tooltip: {}",
e.what());
tooltipWarned = true;
}
setTooltipMarkup("");
}
} else { } else {
setTooltipMarkup(""); setTooltipMarkup("");
} }