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

core/path: catch errors when adding watches

Browse Source 
Errors because of oom conditions or descriptor exhaustion should not
be ignored. We probably cannot recover from those conditions.

Current behaviour wrt. insufficient permissions is described in the
man page. It might make sense in case of user sessions, so I left
it as is.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2013-03-03 08:55:53 -05:00
parent e0207c8d91
commit 28a79bd28b
2 changed files with 32 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/path.c
+17
View File
@@ -79,6 +79,11 @@ int path_spec_watch(PathSpec *s, Unit *u) {
s->primary_wd = inotify_add_watch(s->inotify_fd, k, flags_table[s->type]);
if (s->primary_wd >= 0)
exists = true;
else if (errno != EACCES && errno != ENOENT) {
log_error("Failed to add watch on %s: %m", k);
r = -errno;
goto fail;
}
do {
int flags;
@@ -97,8 +102,20 @@ int path_spec_watch(PathSpec *s, Unit *u) {
if (inotify_add_watch(s->inotify_fd, k, flags) >= 0)
exists = true;
else if (errno != EACCES && errno != ENOENT) {
log_error("Failed to add watch on %s: %m", k);
r = -errno;
goto fail;
}
} while (slash != k);
if (!exists) {
log_error("Failed to add watch on any of the components of %s: %m",
s->path);
r = -errno;
goto fail;
}
return 0;
fail: