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

cgroups-agent: remove ancient fallback code; turn connection error into warning 

During re-execution and shutdown cgroups agents might not be able
to connect to systemd's private D-Bus socket, the printed error to
the console is misleding in that case, so turn it into a warning.
This commit is contained in:
Kay Sievers 2013-07-04 20:54:40 +02:00
parent ad929bcc27
commit c1eba3008c
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/cgroups-agent/cgroups-agent.c
View File

@ -48,26 +48,19 @@ int main(int argc, char *argv[]) {
* this to avoid an activation loop when we start dbus when we
* are called when the dbus service is shut down. */
if (!(bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error))) {
#ifndef NOLEGACY
dbus_error_free(&error);
/* Retry with the pre v21 socket name, to ease upgrades */
if (!(bus = dbus_connection_open_private("unix:abstract=/org/freedesktop/systemd1/private", &error))) {
#endif
log_error("Failed to get D-Bus connection: %s", bus_error_message(&error));
goto finish;
}
#ifndef NOLEGACY
bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error);
if (!bus) {
log_warning("Failed to get D-Bus connection: %s", bus_error_message(&error));
goto finish;
}
#endif
if (bus_check_peercred(bus) < 0) {
log_error("Bus owner not root.");
goto finish;
}
if (!(m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released"))) {
m = dbus_message_new_signal("/org/freedesktop/systemd1/agent", "org.freedesktop.systemd1.Agent", "Released");
if (!m) {
log_error("Could not allocate signal message.");
goto finish;
}