summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-23 18:46:57 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-23 18:46:57 +0100
commit23e1e0c4a3bc93fb841ac9575953ed5d0ef5282d (patch)
treeea2296cfbf02115190c4fb36a079c82377cd2972
parentb61e476f510999c687d3c76193a98aa5cd1f9a73 (diff)
job: start job timer when we begin running the job, not already when we add it to the queue of jobs
-rw-r--r--src/job.c2
-rw-r--r--src/manager.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/job.c b/src/job.c
index 4700aab6ac..ec57144cb7 100644
--- a/src/job.c
+++ b/src/job.c
@@ -376,6 +376,7 @@ int job_run_and_invalidate(Job *j) {
j->state = JOB_RUNNING;
job_add_to_dbus_queue(j);
+ job_start_timer(j);
/* While we execute this operation the job might go away (for
* example: because it is replaced by a new, conflicting
@@ -394,6 +395,7 @@ int job_run_and_invalidate(Job *j) {
* wait */
if (r == -EBADR)
r = 0;
+
break;
case JOB_VERIFY_ACTIVE: {
diff --git a/src/manager.c b/src/manager.c
index f266aaa01c..6759bbac97 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -1216,7 +1216,6 @@ static int transaction_apply(Manager *m) {
job_add_to_run_queue(j);
job_add_to_dbus_queue(j);
- job_start_timer(j);
log_debug("Installed new job %s/%s as %u", j->unit->meta.id, job_type_to_string(j->type), (unsigned) j->id);
}