[systemd-commits] 2 commits - src/dbus-job.c src/dbus-manager.c src/dbus-unit.c src/job.c

[Lennart Poettering]

 src/dbus-job.c     |    5 -----
 src/dbus-manager.c |    5 -----
 src/dbus-unit.c    |    5 -----
 src/job.c          |    5 +++--
 4 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 9c2d9caab23286f3d8dceaaa43ab46e29e3579fb
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 8 00:28:04 2010 +0200

    job: when converting restart jobs, move them to WAITING state

diff --git a/src/job.c b/src/job.c
index 0a9ce15..7cbde80 100644
--- a/src/job.c
+++ b/src/job.c
@@ -461,7 +461,6 @@ int job_finish_and_invalidate(Job *j, bool success) {
         assert(j);
         assert(j->installed);
 
-        log_debug("Job %s/%s finished, success=%s", j->unit->meta.id, job_type_to_string(j->type), yes_no(success));
         job_add_to_dbus_queue(j);
 
         /* Patch restart jobs so that they become normal start jobs */
@@ -471,13 +470,15 @@ int job_finish_and_invalidate(Job *j, bool success) {
                           j->unit->meta.id, job_type_to_string(j->type),
                           j->unit->meta.id, job_type_to_string(JOB_START));
 
-                j->state = JOB_RUNNING;
+                j->state = JOB_WAITING;
                 j->type = JOB_START;
 
                 job_add_to_run_queue(j);
                 return 0;
         }
 
+        log_debug("Job %s/%s finished, success=%s", j->unit->meta.id, job_type_to_string(j->type), yes_no(success));
+
         j->failed = !success;
         u = j->unit;
         t = j->type;
commit 46d95c0fe087a9a4475cae5430e9b33f6c46ff25
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Jul 8 00:27:09 2010 +0200

    dbus: log received message only once, in filter function

diff --git a/src/dbus-job.c b/src/dbus-job.c
index 0956dcf..653e11d 100644
--- a/src/dbus-job.c
+++ b/src/dbus-job.c
@@ -123,11 +123,6 @@ static DBusHandlerResult bus_job_message_handler(DBusConnection *connection, DBu
         assert(message);
         assert(m);
 
-        log_debug("Got D-Bus request: %s.%s() on %s",
-                  dbus_message_get_interface(message),
-                  dbus_message_get_member(message),
-                  dbus_message_get_path(message));
-
         if ((r = manager_get_job_from_dbus_path(m, dbus_message_get_path(message), &j)) < 0) {
 
                 if (r == -ENOMEM)
diff --git a/src/dbus-manager.c b/src/dbus-manager.c
index 7bf58b3..dda7c77 100644
--- a/src/dbus-manager.c
+++ b/src/dbus-manager.c
@@ -243,11 +243,6 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection,
 
         dbus_error_init(&error);
 
-        log_debug("Got D-Bus request: %s.%s() on %s",
-                  dbus_message_get_interface(message),
-                  dbus_message_get_member(message),
-                  dbus_message_get_path(message));
-
         if (dbus_message_is_method_call(message, "org.freedesktop.systemd1.Manager", "GetUnit")) {
                 const char *name;
                 Unit *u;
diff --git a/src/dbus-unit.c b/src/dbus-unit.c
index 63301a0..85125c9 100644
--- a/src/dbus-unit.c
+++ b/src/dbus-unit.c
@@ -345,11 +345,6 @@ static DBusHandlerResult bus_unit_message_handler(DBusConnection *connection, DB
         assert(message);
         assert(m);
 
-        log_debug("Got D-Bus request: %s.%s() on %s",
-                  dbus_message_get_interface(message),
-                  dbus_message_get_member(message),
-                  dbus_message_get_path(message));
-
         if ((r = manager_get_unit_from_dbus_path(m, dbus_message_get_path(message), &u)) < 0) {
 
                 if (r == -ENOMEM)