picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Reverting erroneous changes made of the course of adding a timeout to journal-remote event handling (#7219)

Browse source
This commit is contained in:
martingh 2017-11-01 10:15:38 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 7e21459f6d
commit 723afa4f96
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/journal-remote/journal-remote.c
View file

@ -807,19 +807,13 @@ static int dispatch_http_event(sd_event_source *event,
void *userdata) {
MHDDaemonWrapper *d = userdata;
int r;
fd_set rd, w, e;
MHD_UNSIGNED_LONG_LONG timeout = ULONG_LONG_MAX;
assert(d);
r = MHD_get_fdset(d->daemon, &rd, &w, &e, 0);
r = MHD_run(d->daemon);
if (r == MHD_NO) {
log_error("MHD_get_fdset failed!");
return -EINVAL;
}
r = MHD_run_from_select(d->daemon, &rd, &w, &e);
if (r == MHD_NO) {
log_error("MHD_run_from_select failed!");
log_error("MHD_run failed!");
// XXX: unregister daemon
return -EINVAL;
}