Skip to content

eventlog: add ATTENTION log level #55

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
andoma merged 1 commit into from
Jun 10, 2026
Merged

eventlog: add ATTENTION log level #55

Show file tree
Hide file tree
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
13 changes: 11 additions & 2 deletions include/mios/alert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,15 @@

#include "eventlog.h"

// Alert severity, independent of the event-log levels. Ordered by
// ascending severity: ATTENTION sits between WARNING and ERROR.
typedef enum {
ALERT_LEVEL_NOTICE,
ALERT_LEVEL_WARNING,
ALERT_LEVEL_ATTENTION,
ALERT_LEVEL_ERROR,
} alert_level_t;

typedef struct alert_source {
SLIST_ENTRY(alert_source) as_link;
const struct alert_class *as_class;
Expand All @@ -16,7 +25,7 @@ typedef struct alert_source {

typedef struct alert_class {
void (*ac_message)(const struct alert_source *as, struct stream *output);
event_level_t (*ac_level)(const struct alert_source *as);
alert_level_t (*ac_level)(const struct alert_source *as);
void (*ac_refcount)(struct alert_source *as, int value);
} alert_class_t;

Expand All @@ -30,4 +39,4 @@ int alert_set(alert_source_t *as, int code);

alert_source_t *alert_get_next(alert_source_t *as);

const char *alert_level_to_string(event_level_t level);
const char *alert_level_to_string(alert_level_t level);
6 changes: 3 additions & 3 deletions src/lib/hw/climate_zone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ climate_zone_alert_message(const struct alert_source *as, struct stream *output)
}


static event_level_t
static alert_level_t
climate_zone_alert_level(const struct alert_source *as)
{
if(as->as_code & (CLIMATE_ZONE_OT_ERROR |
Expand All @@ -120,8 +120,8 @@ climate_zone_alert_level(const struct alert_source *as)
CLIMATE_ZONE_TEMP_SENSE_ERROR |
CLIMATE_ZONE_RH_SENSE_ERROR |
CLIMATE_ZONE_FAN_SENSE_ERROR))
return LOG_ERR;
return LOG_WARNING;
return ALERT_LEVEL_ERROR;
return ALERT_LEVEL_WARNING;
}

__attribute__((always_inline))
Expand Down
6 changes: 3 additions & 3 deletions src/lib/hw/power_rail.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ power_rail_alert_message(const struct alert_source *as, struct stream *output)
}


static event_level_t
static alert_level_t
power_rail_alert_level(const struct alert_source *as)
{
if(as->as_code & (POWER_RAIL_TEMP_CRIT |
Expand All @@ -117,8 +117,8 @@ power_rail_alert_level(const struct alert_source *as)
POWER_RAIL_OC_ALERT |
POWER_RAIL_UC_ALERT |
POWER_RAIL_FAULT))
return LOG_ALERT;
return LOG_WARNING;
return ALERT_LEVEL_ERROR;
return ALERT_LEVEL_WARNING;
}


Expand Down
31 changes: 23 additions & 8 deletions src/util/alert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,21 @@ alert_unregister(alert_source_t *as)
alert_source_refcount(as, -1);
}

// Map an alert severity onto the event-log level used when the alert
// is written into the system log. ATTENTION has no distinct event-log
// slot, so it logs as WARNING.
static event_level_t
alert_level_to_event_level(alert_level_t level)
{
switch(level) {
case ALERT_LEVEL_NOTICE: return LOG_NOTICE;
case ALERT_LEVEL_WARNING: return LOG_WARNING;
case ALERT_LEVEL_ATTENTION: return LOG_WARNING;
case ALERT_LEVEL_ERROR: return LOG_ERR;
}
return LOG_WARNING;
}

int
alert_set(alert_source_t *as, int code)
{
Expand All @@ -62,7 +77,7 @@ alert_set(alert_source_t *as, int code)
stprintf(st, "Alert raised [%s] -- ", as->as_key);
const alert_class_t *ac = as->as_class;
ac->ac_message(as, st);
evlog_stream_end(ac->ac_level(as));
evlog_stream_end(alert_level_to_event_level(ac->ac_level(as)));
}

ghook_invoke(GHOOK_ALERT_UPDATED);
Expand All @@ -89,12 +104,12 @@ alert_get_next(alert_source_t *cur)
return as;
}

#define LEVELTBL "EMERG\0ALERT\0CRIT\0ERROR\0WARNING\0NOTICE\0INFO\0DEBUG\0\0"
#define LEVELTBL "NOTICE\0WARNING\0ATTENTION\0ERROR\0\0"

const char *
alert_level_to_string(event_level_t level)
alert_level_to_string(alert_level_t level)
{
return strtbl(LEVELTBL, level & 7);
return strtbl(LEVELTBL, level & 3);
}


Expand All @@ -112,10 +127,10 @@ fake_alert_message(const struct alert_source *as, struct stream *output)
}


static event_level_t
static alert_level_t
fake_alert_level(const struct alert_source *as)
{
return LOG_WARNING;
return ALERT_LEVEL_WARNING;
}

static void
Expand Down Expand Up @@ -166,7 +181,7 @@ cmd_alert(cli_t *cli, int argc, char **argv)
return raise_fake_alert(cli, argv[2]);
}

cli_printf(cli, "Name Severity Details\n");
cli_printf(cli, "Name Severity Details\n");
cli_printf(cli, "========================================================\n");

while((as = alert_get_next(as)) != NULL) {
Expand All @@ -177,7 +192,7 @@ cmd_alert(cli_t *cli, int argc, char **argv)
continue;
}

cli_printf(cli, "%-8s ",
cli_printf(cli, "%-9s ",
alert_level_to_string(as->as_class->ac_level(as)));
as->as_class->ac_message(as, cli->cl_stream);
cli_printf(cli, "\n");
Expand Down
Loading