mirror of
https://github.com/morgan9e/systemd
synced 2026-04-14 00:14:32 +09:00
varlink: say which socket failed to bind in log message
Makes it a lot easier to debug failures
This commit is contained in:
committed by
Yu Watanabe
parent
c7b31a64ee
commit
555d878749
@@ -1101,7 +1101,7 @@ static int manager_bind_varlink(Manager *m) {
|
||||
|
||||
r = sd_varlink_server_listen_address(m->varlink_server, socket_path, 0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '%s': %m", socket_path);
|
||||
|
||||
r = sd_varlink_server_attach_event(m->varlink_server, m->event, SD_EVENT_PRIORITY_NORMAL);
|
||||
if (r < 0)
|
||||
|
||||
@@ -369,7 +369,7 @@ int manager_varlink_init(Manager *m, int fd) {
|
||||
else
|
||||
r = sd_varlink_server_listen_fd(s, fd);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/io.systemd.Login': %m");
|
||||
|
||||
TAKE_FD(fd_close);
|
||||
|
||||
|
||||
@@ -756,7 +756,7 @@ static int manager_varlink_init_userdb(Manager *m) {
|
||||
|
||||
r = sd_varlink_server_listen_address(s, "/run/systemd/userdb/io.systemd.Machine", 0666 | SD_VARLINK_SERVER_MODE_MKDIR_0755);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/userdb/io.systemd.Machine': %m");
|
||||
|
||||
r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);
|
||||
if (r < 0)
|
||||
|
||||
@@ -324,7 +324,7 @@ int manager_connect_varlink(Manager *m, int fd) {
|
||||
else
|
||||
r = sd_varlink_server_listen_fd(s, fd);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/netif/io.systemd.Network': %m");
|
||||
|
||||
TAKE_FD(fd_close);
|
||||
|
||||
|
||||
@@ -772,7 +772,7 @@ static int manager_varlink_init(Manager *m, int fd) {
|
||||
else
|
||||
r = sd_varlink_server_listen_fd(s, fd);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '" VARLINK_ADDR_PATH_MANAGED_OOM_USER "': %m");
|
||||
|
||||
r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);
|
||||
if (r < 0)
|
||||
|
||||
@@ -1470,7 +1470,7 @@ static int varlink_monitor_server_init(Manager *m) {
|
||||
if (r == 0) {
|
||||
r = sd_varlink_server_listen_address(server, "/run/systemd/resolve/io.systemd.Resolve.Monitor", 0666);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/resolve/io.systemd.Resolve.Monitor': %m");
|
||||
}
|
||||
|
||||
r = sd_varlink_server_attach_event(server, m->event, SD_EVENT_PRIORITY_NORMAL);
|
||||
@@ -1526,7 +1526,7 @@ static int varlink_main_server_init(Manager *m) {
|
||||
if (r == 0) {
|
||||
r = sd_varlink_server_listen_address(s, "/run/systemd/resolve/io.systemd.Resolve", 0666);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to bind to varlink socket: %m");
|
||||
return log_error_errno(r, "Failed to bind to varlink socket '/run/systemd/resolve/io.systemd.Resolve': %m");
|
||||
}
|
||||
|
||||
r = sd_varlink_server_attach_event(s, m->event, SD_EVENT_PRIORITY_NORMAL);
|
||||
|
||||
Reference in New Issue
Block a user