log: fix order of log_unit_struct() to match other logging calls

Also, while we are at it, introduce some syntactic sugar for creating
ERRNO= and MESSAGE= structured logging fields.
This commit is contained in:
Lennart Poettering
2014-11-28 02:18:46 +01:00
parent 6c861f0aef
commit e2cc6eca73
17 changed files with 153 additions and 144 deletions
+4 -4
View File
@@ -377,10 +377,10 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) {
return r;
log_struct(LOG_INFO,
MESSAGE_ID(SD_MESSAGE_MACHINE_START),
LOG_MESSAGE_ID(SD_MESSAGE_MACHINE_START),
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
"MESSAGE=New machine %s.", m->name,
LOG_MESSAGE("New machine %s.", m->name),
NULL);
if (!dual_timestamp_is_set(&m->timestamp))
@@ -426,10 +426,10 @@ int machine_stop(Machine *m) {
if (m->started)
log_struct(LOG_INFO,
MESSAGE_ID(SD_MESSAGE_MACHINE_STOP),
LOG_MESSAGE_ID(SD_MESSAGE_MACHINE_STOP),
"NAME=%s", m->name,
"LEADER="PID_FMT, m->leader,
"MESSAGE=Machine %s terminated.", m->name,
LOG_MESSAGE("Machine %s terminated.", m->name),
NULL);
/* Kill cgroup */