diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-16 11:24:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 11:24:03 +0100 |
| commit | 2fe917fe916cae66194d12cafdb24333e808f1d7 (patch) | |
| tree | b8521991a6045ac4ddedd68d06af50f8c8869a89 /src/core/job.c | |
| parent | 0cbc024d591e1b1095d90494e0337dabd9ef2e19 (diff) | |
| parent | 561eede4d126610ee5023098fc2787bd8864f144 (diff) | |
Merge pull request #4526 from keszybz/coredump-python
Collect interpreter backtraces in systemd-coredump
Diffstat (limited to 'src/core/job.c')
| -rw-r--r-- | src/core/job.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/core/job.c b/src/core/job.c index 07f4b74c5c..e2349830a8 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -746,9 +746,8 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) { } static void job_log_status_message(Unit *u, JobType t, JobResult result) { - const char *format; + const char *format, *mid; char buf[LINE_MAX]; - sd_id128_t mid; static const int job_result_log_level[_JOB_RESULT_MAX] = { [JOB_DONE] = LOG_INFO, [JOB_CANCELED] = LOG_INFO, @@ -784,16 +783,19 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) { switch (t) { case JOB_START: - mid = result == JOB_DONE ? SD_MESSAGE_UNIT_STARTED : SD_MESSAGE_UNIT_FAILED; + if (result == JOB_DONE) + mid = "MESSAGE_ID=" SD_MESSAGE_UNIT_STARTED_STR; + else + mid = "MESSAGE_ID=" SD_MESSAGE_UNIT_FAILED_STR; break; case JOB_RELOAD: - mid = SD_MESSAGE_UNIT_RELOADED; + mid = "MESSAGE_ID=" SD_MESSAGE_UNIT_RELOADED_STR; break; case JOB_STOP: case JOB_RESTART: - mid = SD_MESSAGE_UNIT_STOPPED; + mid = "MESSAGE_ID=" SD_MESSAGE_UNIT_STOPPED_STR; break; default: @@ -806,7 +808,7 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) { } log_struct(job_result_log_level[result], - LOG_MESSAGE_ID(mid), + mid, LOG_UNIT_ID(u), LOG_MESSAGE("%s", buf), "RESULT=%s", job_result_to_string(result), |