log: don't reopen /dev/console each time we call log_open()

[elogind.git] / src / core / busname.c

diff --git a/src/core/busname.c b/src/core/busname.c
index 49a43feb376f3b4afb2580e84f62bfb787168751..034e5f60d12373a5fd9dbbbc91f83088b5bdf490 100644 (file)
--- a/src/core/busname.c
+++ b/src/core/busname.c
@@ -197,6 +197,8 @@ static void busname_unwatch_fd(BusName *n) {
 static void busname_close_fd(BusName *n) {
         assert(n);
 
+        busname_unwatch_fd(n);
+
         if (n->starter_fd <= 0)
                 return;
 
@@ -333,6 +335,11 @@ static void busname_enter_running(BusName *n) {
 
         if (unit_stop_pending(UNIT(n))) {
                 log_debug_unit(UNIT(n)->id, "Suppressing activation request on %s since unit stop is scheduled.", UNIT(n)->id);
+
+                /* Flush all queued activation reqeuest by closing and reopening the connection */
+
+                busname_close_fd(n);
+                busname_enter_listening(n);
                 return;
         }