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

Be more verbose when bind or listen fails

Browse source 
Also be more verbose in devnode_acl_all().
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-03-03 19:49:40 -05:00
parent 3fb97a58fa
commit 6b9732b2bf
6 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/manager.c
View file

@ -554,7 +554,7 @@ static int manager_setup_notify(Manager *m) {
strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1);
r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind() failed: %m");
log_error("bind(@%s) failed: %m", sa.un.sun_path+1);
return -errno;
}

2
src/journal/journald-native.c
View file

@ -404,7 +404,7 @@ int server_open_native_socket(Server*s) {
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind() failed: %m");
log_error("bind(%s) failed: %m", sa.un.sun_path);
return -errno;
}

4
src/journal/journald-stream.c
View file

@ -450,14 +450,14 @@ int server_open_stdout_socket(Server *s) {
r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind() failed: %m");
log_error("bind(%s) failed: %m", sa.un.sun_path);
return -errno;
}
chmod(sa.un.sun_path, 0666);
if (listen(s->stdout_fd, SOMAXCONN) < 0) {
log_error("listen() failed: %m");
log_error("listen(%s) failed: %m", sa.un.sun_path);
return -errno;
}
} else

2
src/journal/journald-syslog.c
View file

@ -441,7 +441,7 @@ int server_open_syslog_socket(Server *s) {
r = bind(s->syslog_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
if (r < 0) {
log_error("bind() failed: %m");
log_error("bind(%s) failed: %m", sa.un.sun_path);
return -errno;
}

5
src/login/logind-acl.c
View file

@ -277,7 +277,10 @@ int devnode_acl_all(struct udev *udev,
SET_FOREACH(n, nodes, i) {
int k;
log_debug("Fixing up ACLs at %s for seat %s", n, seat);
log_debug("Changing ACLs at %s for seat %s (uid "UID_FMT"→"UID_FMT"%s%s)",
n, seat, old_uid, new_uid,
del ? " del" : "", add ? " add" : "");
k = devnode_acl(n, flush, del, old_uid, add, new_uid);
if (k == -ENOENT)
log_debug("Device %s disappeared while setting ACLs", n);

2
src/shared/ask-password-api.c
View file

@ -270,7 +270,7 @@ static int create_socket(char **name) {
if (r < 0) {
r = -errno;
log_error("bind() failed: %m");
log_error("bind(%s) failed: %m", sa.un.sun_path);
goto fail;
}