chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fb5ef06
)
Revert "socket: if we fail to create an instantiated service for a socket, don't...
author
Michal Schmidt
<mschmidt@redhat.com>
Mon, 2 Apr 2012 19:49:00 +0000
(21:49 +0200)
committer
Michal Schmidt
<mschmidt@redhat.com>
Mon, 2 Apr 2012 19:49:00 +0000
(21:49 +0200)
This reverts commit
9586cdfab6a2638078702b7fea7e16b3a71899e2
.
(but not the TODO hunk).
The bug was already fixed by
1a710b43
. And if other errors occur, we
don't want to leave the socket active in order to avoid having socket
tarpits.
src/socket.c
patch
|
blob
|
history
diff --git
a/src/socket.c
b/src/socket.c
index 1cd98e29920cf14769d083b2332091d5038dc73a..bb75d960ab5fd2555406f2ea99c2cebe09df976d 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-1494,6
+1494,7
@@
static void socket_enter_running(Socket *s, int cfd) {
fail:
log_warning("%s failed to queue socket startup job: %s", UNIT(s)->id, bus_error(&error, r));
+ socket_enter_stop_pre(s, SOCKET_FAILURE_RESOURCES);
if (cfd >= 0)
close_nointr_nofail(cfd);