picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log: introduce a macro to format message id 

The MESSAGE_ID=... stanza will appear in countless number of places.
It is just too long to write it out in full each time.

Incidentally, this also fixes a typo of MESSSAGE is three places.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2012-10-08 17:02:30 +00:00
parent c0735bb218
commit 1ca6783f5e
10 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/job.c
View File

@ -705,7 +705,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
mid = result == JOB_DONE ? SD_MESSAGE_UNIT_STARTED : SD_MESSAGE_UNIT_FAILED; mid = result == JOB_DONE ? SD_MESSAGE_UNIT_STARTED : SD_MESSAGE_UNIT_FAILED;
log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR, log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR,
"MESSSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(mid), MESSAGE_ID(mid),
"UNIT=%s", u->id, "UNIT=%s", u->id,
"RESULT=%s", job_result_to_string(result), "RESULT=%s", job_result_to_string(result),
"MESSAGE=%s", buf, "MESSAGE=%s", buf,
@ -713,7 +713,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
} else if (t == JOB_STOP) } else if (t == JOB_STOP)
log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR, log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR,
"MESSSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_UNIT_STOPPED), MESSAGE_ID(SD_MESSAGE_UNIT_STOPPED),
"UNIT=%s", u->id, "UNIT=%s", u->id,
"RESULT=%s", job_result_to_string(result), "RESULT=%s", job_result_to_string(result),
"MESSAGE=%s", buf, "MESSAGE=%s", buf,
@ -721,7 +721,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
else if (t == JOB_RELOAD) else if (t == JOB_RELOAD)
log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR, log_struct(result == JOB_DONE ? LOG_INFO : LOG_ERR,
"MESSSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_UNIT_RELOADED), MESSAGE_ID(SD_MESSAGE_UNIT_RELOADED),
"UNIT=%s", u->id, "UNIT=%s", u->id,
"RESULT=%s", job_result_to_string(result), "RESULT=%s", job_result_to_string(result),
"MESSAGE=%s", buf, "MESSAGE=%s", buf,

6
src/core/manager.c
View File

@ -2039,7 +2039,7 @@ void manager_check_finished(Manager *m) {
if (!log_on_console()) if (!log_on_console())
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_STARTUP_FINISHED), MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
"KERNEL_USEC=%llu", (unsigned long long) kernel_usec, "KERNEL_USEC=%llu", (unsigned long long) kernel_usec,
"INITRD_USEC=%llu", (unsigned long long) initrd_usec, "INITRD_USEC=%llu", (unsigned long long) initrd_usec,
"USERSPACE_USEC=%llu", (unsigned long long) userspace_usec, "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
@ -2055,7 +2055,7 @@ void manager_check_finished(Manager *m) {
if (!log_on_console()) if (!log_on_console())
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_STARTUP_FINISHED), MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
"KERNEL_USEC=%llu", (unsigned long long) kernel_usec, "KERNEL_USEC=%llu", (unsigned long long) kernel_usec,
"USERSPACE_USEC=%llu", (unsigned long long) userspace_usec, "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
"MESSAGE=Startup finished in %s (kernel) + %s (userspace) = %s.", "MESSAGE=Startup finished in %s (kernel) + %s (userspace) = %s.",
@ -2070,7 +2070,7 @@ void manager_check_finished(Manager *m) {
if (!log_on_console()) if (!log_on_console())
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_STARTUP_FINISHED), MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
"USERSPACE_USEC=%llu", (unsigned long long) userspace_usec, "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
"MESSAGE=Startup finished in %s.", "MESSAGE=Startup finished in %s.",
format_timespan(sum, sizeof(sum), total_usec), format_timespan(sum, sizeof(sum), total_usec),

2
src/core/unit.c
View File

@ -1023,7 +1023,7 @@ static void unit_status_log_starting_stopping_reloading(Unit *u, JobType t) {
SD_MESSAGE_UNIT_RELOADING; SD_MESSAGE_UNIT_RELOADING;
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(mid), MESSAGE_ID(mid),
"UNIT=%s", u->id, "UNIT=%s", u->id,
"MESSAGE=%s", buf, "MESSAGE=%s", buf,
NULL); NULL);

2
src/journal/journald.c
View File

@ -725,7 +725,7 @@ void server_driver_message(Server *s, sd_id128_t message_id, const char *format,
IOVEC_SET_STRING(iovec[n++], buffer); IOVEC_SET_STRING(iovec[n++], buffer);
if (!sd_id128_equal(message_id, SD_ID128_NULL)) { if (!sd_id128_equal(message_id, SD_ID128_NULL)) {
snprintf(mid, sizeof(mid), "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(message_id)); snprintf(mid, sizeof(mid), MESSAGE_ID(message_id));
char_array_0(mid); char_array_0(mid);
IOVEC_SET_STRING(iovec[n++], mid); IOVEC_SET_STRING(iovec[n++], mid);
} }

3
src/login/logind-dbus.c
View File

@ -1180,8 +1180,7 @@ static int bus_manager_log_shutdown(
q = NULL; q = NULL;
} }
return log_struct(LOG_NOTICE, return log_struct(LOG_NOTICE, MESSAGE_ID(SD_MESSAGE_SHUTDOWN),
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SHUTDOWN),
p, p,
q, NULL); q, NULL);
} }

4
src/login/logind-seat.c
View File

@ -341,7 +341,7 @@ int seat_start(Seat *s) {
return 0; return 0;
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SEAT_START), MESSAGE_ID(SD_MESSAGE_SEAT_START),
"SEAT_ID=%s", s->id, "SEAT_ID=%s", s->id,
"MESSAGE=New seat %s.", s->id, "MESSAGE=New seat %s.", s->id,
NULL); NULL);
@ -369,7 +369,7 @@ int seat_stop(Seat *s) {
if (s->started) if (s->started)
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SEAT_STOP), MESSAGE_ID(SD_MESSAGE_SEAT_STOP),
"SEAT_ID=%s", s->id, "SEAT_ID=%s", s->id,
"MESSAGE=Removed seat %s.", s->id, "MESSAGE=Removed seat %s.", s->id,
NULL); NULL);

4
src/login/logind-session.c
View File

@ -547,7 +547,7 @@ int session_start(Session *s) {
return r; return r;
log_struct(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG, log_struct(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SESSION_START), MESSAGE_ID(SD_MESSAGE_SESSION_START),
"SESSION_ID=%s", s->id, "SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name, "USER_ID=%s", s->user->name,
"LEADER=%lu", (unsigned long) s->leader, "LEADER=%lu", (unsigned long) s->leader,
@ -689,7 +689,7 @@ int session_stop(Session *s) {
if (s->started) if (s->started)
log_struct(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG, log_struct(s->type == SESSION_TTY || s->type == SESSION_X11 ? LOG_INFO : LOG_DEBUG,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SESSION_STOP), MESSAGE_ID(SD_MESSAGE_SESSION_STOP),
"SESSION_ID=%s", s->id, "SESSION_ID=%s", s->id,
"USER_ID=%s", s->user->name, "USER_ID=%s", s->user->name,
"LEADER=%lu", (unsigned long) s->leader, "LEADER=%lu", (unsigned long) s->leader,

8
src/sleep/sleep.c
View File

@ -69,13 +69,13 @@ int main(int argc, char *argv[]) {
if (streq(argv[1], "suspend")) if (streq(argv[1], "suspend"))
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SLEEP_START), MESSAGE_ID(SD_MESSAGE_SLEEP_START),
"MESSAGE=Suspending system...", "MESSAGE=Suspending system...",
"SLEEP=suspend", "SLEEP=suspend",
NULL); NULL);
else else
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SLEEP_START), MESSAGE_ID(SD_MESSAGE_SLEEP_START),
"MESSAGE=Hibernating system...", "MESSAGE=Hibernating system...",
"SLEEP=hibernate", "SLEEP=hibernate",
NULL); NULL);
@ -88,13 +88,13 @@ int main(int argc, char *argv[]) {
if (streq(argv[1], "suspend")) if (streq(argv[1], "suspend"))
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SLEEP_STOP), MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
"MESSAGE=System resumed.", "MESSAGE=System resumed.",
"SLEEP=suspend", "SLEEP=suspend",
NULL); NULL);
else else
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SLEEP_STOP), MESSAGE_ID(SD_MESSAGE_SLEEP_STOP),
"MESSAGE=System thawed.", "MESSAGE=System thawed.",
"SLEEP=hibernate", "SLEEP=hibernate",
NULL); NULL);

1
src/systemd/sd-id128.h
View File

@ -65,6 +65,7 @@ static inline int sd_id128_equal(sd_id128_t a, sd_id128_t b) {
} }
#define SD_ID128_NULL ((sd_id128_t) { .qwords = { 0, 0 }}) #define SD_ID128_NULL ((sd_id128_t) { .qwords = { 0, 0 }})
#define MESSAGE_ID(x) "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(x)
#ifdef __cplusplus #ifdef __cplusplus
} }

4
src/timedate/timedated.c
View File

@ -701,7 +701,7 @@ static DBusHandlerResult timedate_message_handler(
} }
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_TIMEZONE_CHANGE), MESSAGE_ID(SD_MESSAGE_TIMEZONE_CHANGE),
"TIMEZONE=%s", tz.zone, "TIMEZONE=%s", tz.zone,
"MESSAGE=Changed timezone to '%s'.", tz.zone, "MESSAGE=Changed timezone to '%s'.", tz.zone,
NULL); NULL);
@ -843,7 +843,7 @@ static DBusHandlerResult timedate_message_handler(
hwclock_set_time(tm); hwclock_set_time(tm);
log_struct(LOG_INFO, log_struct(LOG_INFO,
"MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_TIME_CHANGE), MESSAGE_ID(SD_MESSAGE_TIME_CHANGE),
"REALTIME=%llu", (unsigned long long) timespec_load(&ts), "REALTIME=%llu", (unsigned long long) timespec_load(&ts),
"MESSAGE=Changed local time to %s", ctime(&ts.tv_sec), "MESSAGE=Changed local time to %s", ctime(&ts.tv_sec),
NULL); NULL);