diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-10-08 17:02:30 +0000 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-10-13 14:26:30 +0200 |
| commit | 1ca6783f5ea3755bd83e723f529c2eda512c7fed (patch) | |
| tree | 8c8976c5ffcd9bbaeab0d11836f0b68745f19c43 /src/login | |
| parent | c0735bb2183493147c17a509ec8038bced5d35c9 (diff) | |
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.
Diffstat (limited to 'src/login')
| -rw-r--r-- | src/login/logind-dbus.c | 3 | ||||
| -rw-r--r-- | src/login/logind-seat.c | 4 | ||||
| -rw-r--r-- | src/login/logind-session.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index cbf43fe0a0..b95cc9bfbb 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -1180,8 +1180,7 @@ static int bus_manager_log_shutdown( q = NULL; } - return log_struct(LOG_NOTICE, - "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(SD_MESSAGE_SHUTDOWN), + return log_struct(LOG_NOTICE, MESSAGE_ID(SD_MESSAGE_SHUTDOWN), p, q, NULL); } diff --git a/src/login/logind-seat.c b/src/login/logind-seat.c index 0ae0c520e6..470d08bc05 100644 --- a/src/login/logind-seat.c +++ b/src/login/logind-seat.c @@ -341,7 +341,7 @@ int seat_start(Seat *s) { return 0; 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, "MESSAGE=New seat %s.", s->id, NULL); @@ -369,7 +369,7 @@ int seat_stop(Seat *s) { if (s->started) 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, "MESSAGE=Removed seat %s.", s->id, NULL); diff --git a/src/login/logind-session.c b/src/login/logind-session.c index 958b516701..5d9401b223 100644 --- a/src/login/logind-session.c +++ b/src/login/logind-session.c @@ -547,7 +547,7 @@ int session_start(Session *s) { return r; 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, "USER_ID=%s", s->user->name, "LEADER=%lu", (unsigned long) s->leader, @@ -689,7 +689,7 @@ int session_stop(Session *s) { if (s->started) 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, "USER_ID=%s", s->user->name, "LEADER=%lu", (unsigned long) s->leader, |