summaryrefslogtreecommitdiff
path: root/src/cgroups-agent
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-03-06 16:02:31 +0100
committerAndy Wingo <wingo@pobox.com>2016-03-06 16:02:31 +0100
commit162255186046fa7a5e82859b7dba5a7909ce6fc4 (patch)
tree8b81f2e7afac4df45ebca6e662d4d2b1d8635e5a /src/cgroups-agent
parent6f5035f2db6ab7b4beae46c44b95e6a8b6d956b5 (diff)
Classify processes from sessions into cgroups
Create a private cgroup tree associated with no controllers, and use it to map PIDs to sessions. Since we use our own path structure, remove internal cgroup-related helpers that interpret the cgroup path structure to pull out users, slices, and scopes.
Diffstat (limited to 'src/cgroups-agent')
-rw-r--r--src/cgroups-agent/cgroups-agent.c18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 529e84303..3be4cff80 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -38,17 +38,13 @@ int main(int argc, char *argv[]) {
log_parse_environment();
log_open();
- /* 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_open_system_systemd(&bus);
+ /* Unlike in systemd where this has to use a private socket,
+ since logind 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);
if (r < 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");
+ log_debug_errno(r, "Failed to open system bus: %m");
return EXIT_FAILURE;
}
@@ -58,7 +54,7 @@ int main(int argc, char *argv[]) {
"Released",
"s", argv[1]);
if (r < 0) {
- log_debug_errno(r, "Failed to send signal message on private connection: %m");
+ log_debug_errno(r, "Failed to send signal message: %m");
return EXIT_FAILURE;
}