| From 1d9614d1e6086b6b5c0e08ebdb4df3c66d59ab6f Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl> |
| Date: Mon, 3 Mar 2014 19:49:40 -0500 |
| Subject: [PATCH] Be more verbose when bind or listen fails |
| |
| Also be more verbose in devnode_acl_all(). |
| |
| (cherry picked from commit 6b9732b2bf0499c5e4ea8a9d4f6051d98033f680) |
| |
| src/core/manager.c | 2 +- |
| src/journal/journald-native.c | 2 +- |
| src/journal/journald-stream.c | 4 ++-- |
| src/journal/journald-syslog.c | 2 +- |
| src/login/logind-acl.c | 5 ++++- |
| src/shared/ask-password-api.c | 2 +- |
| 6 files changed, 10 insertions(+), 7 deletions(-) |
| |
| diff --git a/src/core/manager.c b/src/core/manager.c |
| index edcde31ec1..9b754d8f02 100644 |
| |
| |
| @@ -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; |
| } |
| |
| diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c |
| index c54f6475d3..666cbd2102 100644 |
| |
| |
| @@ -387,7 +387,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; |
| } |
| |
| diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c |
| index 89da150a60..8a983d84d9 100644 |
| |
| |
| @@ -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 |
| diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c |
| index b826e23c01..f97e0d2ba9 100644 |
| |
| |
| @@ -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; |
| } |
| |
| diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c |
| index 4bbeb64e8b..af7c352ce5 100644 |
| |
| |
| @@ -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); |
| diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c |
| index 5997a03fb2..8d03f4ad09 100644 |
| |
| |
| @@ -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; |
| } |
| |