service: minor modernizations
This commit is contained in:
committed by
Mike Yuan
parent
45f540a297
commit
51339a9aeb
+13
-13
@@ -3445,30 +3445,30 @@ fail:
|
||||
}
|
||||
|
||||
static int service_demand_pid_file(Service *s) {
|
||||
PathSpec *ps;
|
||||
_cleanup_free_ PathSpec *ps = NULL;
|
||||
|
||||
assert(s->pid_file);
|
||||
assert(!s->pid_file_pathspec);
|
||||
|
||||
ps = new0(PathSpec, 1);
|
||||
ps = new(PathSpec, 1);
|
||||
if (!ps)
|
||||
return -ENOMEM;
|
||||
|
||||
ps->unit = UNIT(s);
|
||||
ps->path = strdup(s->pid_file);
|
||||
if (!ps->path) {
|
||||
free(ps);
|
||||
*ps = (PathSpec) {
|
||||
.unit = UNIT(s),
|
||||
.path = strdup(s->pid_file),
|
||||
/* PATH_CHANGED would not be enough. There are daemons (sendmail) that keep their PID file
|
||||
* open all the time. */
|
||||
.type = PATH_MODIFIED,
|
||||
.inotify_fd = -EBADF,
|
||||
};
|
||||
|
||||
if (!ps->path)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
path_simplify(ps->path);
|
||||
|
||||
/* PATH_CHANGED would not be enough. There are daemons (sendmail) that
|
||||
* keep their PID file open all the time. */
|
||||
ps->type = PATH_MODIFIED;
|
||||
ps->inotify_fd = -EBADF;
|
||||
|
||||
s->pid_file_pathspec = ps;
|
||||
s->pid_file_pathspec = TAKE_PTR(ps);
|
||||
|
||||
return service_watch_pid_file(s);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user