SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

core: only set event source name when we create an event source

Browse Source
This commit is contained in:
Lennart Poettering
2015-05-13 18:30:14 +02:00
parent b4a855e9f6
commit cbf60d0a7f
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/socket.c
+8 -7
View File
@@ -1268,22 +1268,23 @@ static int socket_watch_fds(Socket *s) {
if (p->fd < 0)
continue;
if (p->event_source)
if (p->event_source) {
r = sd_event_source_set_enabled(p->event_source, SD_EVENT_ON);
else
if (r < 0)
goto fail;
} else {
r = sd_event_add_io(UNIT(s)->manager->event, &p->event_source, p->fd, EPOLLIN, socket_dispatch_io, p);
if (r < 0)
goto fail;
if (r < 0) {
log_unit_warning_errno(UNIT(s), r, "Failed to watch listening fds: %m");
goto fail;
(void) sd_event_source_set_description(p->event_source, "socket-port-io");
}
(void) sd_event_source_set_description(p->event_source, "socket-port-io");
}
return 0;
fail:
log_unit_warning_errno(UNIT(s), r, "Failed to watch listening fds: %m");
socket_unwatch_fds(s);
return r;
}