chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: replace OnFailureIsolate= setting by a more generic OnFailureJobMode= setting...
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index e408338b10de04adca84fe22b1e4069cc5274256..28b1465c19918f331969b0f13449bf76f83371a4 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-2916,7
+2916,12
@@
static int service_demand_pid_file(Service *s) {
}
static int service_dispatch_io(sd_event_source *source, int fd, uint32_t events, void *userdata) {
}
static int service_dispatch_io(sd_event_source *source, int fd, uint32_t events, void *userdata) {
- Service *s = SERVICE(userdata);
+ PathSpec *p = userdata;
+ Service *s;
+
+ assert(p);
+
+ s = SERVICE(p->unit);
assert(s);
assert(fd >= 0);
assert(s);
assert(fd >= 0);
@@
-2926,7
+2931,7
@@
static int service_dispatch_io(sd_event_source *source, int fd, uint32_t events,
log_debug_unit(UNIT(s)->id, "inotify event for %s", UNIT(s)->id);
log_debug_unit(UNIT(s)->id, "inotify event for %s", UNIT(s)->id);
- if (path_spec_fd_event(
s->pid_file_pathspec
, events) < 0)
+ if (path_spec_fd_event(
p
, events) < 0)
goto fail;
if (service_retry_pid_file(s) == 0)
goto fail;
if (service_retry_pid_file(s) == 0)