diff options
| author | Lennart Poettering <lennart@poettering.net> | 2016-04-22 10:50:07 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2016-04-22 10:50:07 +0200 |
| commit | c54f168f143096ecdc6764d834641951cab924f9 (patch) | |
| tree | eeeb09343741de1d4c7ed17fabdfeda597e7a8a7 /src/journal/journald-server.c | |
| parent | 5f390fc01c8b694af1144252f6294b357f05e42e (diff) | |
| parent | ccddd104fc95e0e769142af6e1fe1edec5be70a6 (diff) | |
Merge pull request #3088 from keszybz/man
One man fix and unicodification of dashes
Diffstat (limited to 'src/journal/journald-server.c')
| -rw-r--r-- | src/journal/journald-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index b1d1bf9e14..8089bb5883 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1660,7 +1660,7 @@ static int server_connect_notify(Server *s) { it. Specifically: given that PID 1 might block on dbus-daemon during IPC, and dbus-daemon is logging to us, and might hence block on us, we might end up in a deadlock - if we block on sending PID 1 notification messages -- by + if we block on sending PID 1 notification messages — by generating a full blocking circle. To avoid this, let's create a non-blocking socket, and connect it to the notification socket, and then wait for POLLOUT before we |