Classify processes from sessions into cgroups

[elogind.git] / src / cgroups-agent / cgroups-agent.c

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 256de1f506c814f6354b03e9bcfe602ff76c4648..47a526b87f6be7cd0c8ed011524629d4c6f40cbc 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -22,12 +22,11 @@
 #include <stdlib.h>
 
 #include "sd-bus.h"
-
 #include "log.h"
 #include "bus-util.h"
 
 int main(int argc, char *argv[]) {
-        _cleanup_bus_unref_ sd_bus *bus = NULL;
+        _cleanup_bus_flush_close_unref_ sd_bus *bus = NULL;
         int r;
 
         if (argc != 2) {
@@ -39,14 +38,32 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
+#if 0
         /* We send this event to the private D-Bus socket and then the
          * system instance will forward this to the system bus. We do
          * this to avoid an activation loop when we start dbus when we
          * are called when the dbus service is shut down. */
 
-        r = bus_connect_system(&bus);
+        r = bus_open_system_systemd(&bus);
+#else
+        /* Unlike in systemd where this has to use a private socket,
+           since elogind doesn't associate control groups with services
+           and doesn't manage the dbus service, we can just use the
+           system bus.  */
+        r = sd_bus_open_system(&bus);
+#endif // 0
+
         if (r < 0) {
-                log_warning("Failed to get D-Bus connection: %s", strerror(-r));
+#if 0
+                /* If we couldn't connect we assume this was triggered
+                 * while systemd got restarted/transitioned from
+                 * initrd to the system, so let's ignore this */
+                log_debug_errno(r, "Failed to get D-Bus connection: %m");
+#else
+                /* If dbus isn't running or responding, there is nothing
+                 * we can do about it. */
+                log_debug_errno(r, "Failed to open system bus: %m");
+#endif
                 return EXIT_FAILURE;
         }
 
@@ -56,11 +73,13 @@ int main(int argc, char *argv[]) {
                                "Released",
                                "s", argv[1]);
         if (r < 0) {
-                log_error("Failed to send signal message on private connection: %s", strerror(-r));
+#if 0
+                log_debug_errno(r, "Failed to send signal message on private connection: %m");
+#else
+                log_debug_errno(r, "Failed to send signal message: %m");
+#endif
                 return EXIT_FAILURE;
         }
 
-        sd_bus_flush(bus);
-
         return EXIT_SUCCESS;
 }