]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: tweak manager_journal_is_running() a bit more
authorLennart Poettering <lennart@poettering.net>
Wed, 7 Feb 2018 14:07:00 +0000 (15:07 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 12 Feb 2018 10:34:00 +0000 (11:34 +0100)
Let's also use the journal if it is currently reloading. In that state
it should also be able to process our requests. Moreover, we might
otherwise end up disconnecting/reconnecting from the journal without
really any need to hence, relax the check accordingly.

src/core/manager.c

index 30a020f777877b24d88adfa3f85fd455efd91645..9c68eb49d1906ab824121122deb6e65a72d345b0 100644 (file)
@@ -3587,7 +3587,7 @@ static bool manager_journal_is_running(Manager *m) {
         u = manager_get_unit(m, SPECIAL_JOURNALD_SERVICE);
         if (!u)
                 return false;
-        if (SERVICE(u)->state != SERVICE_RUNNING)
+        if (!IN_SET(SERVICE(u)->state, SERVICE_RELOAD, SERVICE_RUNNING))
                 return false;
 
         return true;