service: only kill the main daemon for legacy sysv services, so that we don't kill...

[elogind.git] / socket.c

diff --git a/socket.c b/socket.c
index cb065b75bfeca5af7f7d31b2b34e6d403f9846f1..755bc598da7e035b3a278525b543e717ff4caec4 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -667,7 +667,7 @@ static void socket_enter_signal(Socket *s, SocketState state, bool success) {
                         }
         }
 
-        if (sent) {
+        if (sent && s->control_pid > 0) {
                 if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
                         goto fail;
 
@@ -1110,7 +1110,6 @@ static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 }
         }
 
-        log_debug("cfd=%i", cfd);
         socket_enter_running(s, cfd);
         return;