summaryrefslogtreecommitdiff
path: root/src/job.c
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2012-03-28 01:26:04 +0200
committerMichal Schmidt <mschmidt@redhat.com>2012-03-28 11:13:13 +0200
commitbbd1a8374f90605319d0404ebb423795337161bd (patch)
tree20b34dcb96decaffd9d2e678c0b6333855d28159 /src/job.c
parentdd17d38879503f018fdf6bbff822970afcddb6f1 (diff)
job: add debug prints where job type gets changed
Diffstat (limited to 'src/job.c')
-rw-r--r--src/job.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/job.c b/src/job.c
index d43ce8e88d..8e944b35db 100644
--- a/src/job.c
+++ b/src/job.c
@@ -355,6 +355,14 @@ bool job_is_runnable(Job *j) {
return true;
}
+static void job_change_type(Job *j, JobType newtype) {
+ log_debug("Converting job %s/%s -> %s/%s",
+ j->unit->id, job_type_to_string(j->type),
+ j->unit->id, job_type_to_string(newtype));
+
+ j->type = newtype;
+}
+
int job_run_and_invalidate(Job *j) {
int r;
uint32_t id;
@@ -389,11 +397,11 @@ int job_run_and_invalidate(Job *j) {
case JOB_RELOAD_OR_START:
if (unit_active_state(j->unit) == UNIT_ACTIVE) {
- j->type = JOB_RELOAD;
+ job_change_type(j, JOB_RELOAD);
r = unit_reload(j->unit);
break;
}
- j->type = JOB_START;
+ job_change_type(j, JOB_START);
/* fall through */
case JOB_START:
@@ -420,7 +428,7 @@ int job_run_and_invalidate(Job *j) {
r = -ENOEXEC;
break;
}
- j->type = JOB_RESTART;
+ job_change_type(j, JOB_RESTART);
/* fall through */
case JOB_STOP:
@@ -516,12 +524,8 @@ int job_finish_and_invalidate(Job *j, JobResult result) {
/* Patch restart jobs so that they become normal start jobs */
if (result == JOB_DONE && j->type == JOB_RESTART) {
- log_debug("Converting job %s/%s -> %s/%s",
- j->unit->id, job_type_to_string(j->type),
- j->unit->id, job_type_to_string(JOB_START));
-
+ job_change_type(j, JOB_START);
j->state = JOB_WAITING;
- j->type = JOB_START;
job_add_to_run_queue(j);