summaryrefslogtreecommitdiff
path: root/src/login
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-07-02 17:17:35 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-02 17:18:41 +0200
commitd0af76e68a5bab2e4fd9674b1c64a9f38d7afe97 (patch)
treea45e3254f7b2737fb24c142c4a41f5f0e98f0108 /src/login
parent8b6fe8243d6a46d7435fb6789481489c44549cfb (diff)
logind: after deserializatio readd systemd units to unit-to-object hashmap correctly
Diffstat (limited to 'src/login')
-rw-r--r--src/login/logind-session.c36
-rw-r--r--src/login/logind-user.c60
2 files changed, 53 insertions, 43 deletions
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
index 6e1bf6d560..2892c38417 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -455,9 +455,7 @@ done:
}
static int session_start_scope(Session *s) {
- _cleanup_free_ char *description = NULL;
DBusError error;
- char *job;
int r;
assert(s);
@@ -467,26 +465,32 @@ static int session_start_scope(Session *s) {
dbus_error_init(&error);
if (!s->scope) {
- s->scope = strjoin("session-", s->id, ".scope", NULL);
- if (!s->scope)
+ _cleanup_free_ char *description = NULL;
+ char *scope, *job;
+
+ scope = strjoin("session-", s->id, ".scope", NULL);
+ if (!scope)
return log_oom();
- r = hashmap_put(s->manager->session_units, s->scope, s);
- if (r < 0)
- log_warning("Failed to create mapping between unit and session");
- }
+ description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
- description = strjoin("Session ", s->id, " of user ", s->user->name, NULL);
+ r = manager_start_scope(s->manager, scope, s->leader, s->user->slice, description, &error, &job);
+ if (r < 0) {
+ log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
+ dbus_error_free(&error);
- r = manager_start_scope(s->manager, s->scope, s->leader, s->user->slice, description, &error, &job);
- if (r < 0) {
- log_error("Failed to start session scope: %s %s", bus_error(&error, r), error.name);
- dbus_error_free(&error);
- } else {
- free(s->scope_job);
- s->scope_job = job;
+ free(scope);
+ } else {
+ s->scope = scope;
+
+ free(s->scope_job);
+ s->scope_job = job;
+ }
}
+ if (s->scope)
+ hashmap_put(s->manager->session_units, s->scope, s);
+
return 0;
}
diff --git a/src/login/logind-user.c b/src/login/logind-user.c
index fb961bf64b..0a985a53ec 100644
--- a/src/login/logind-user.c
+++ b/src/login/logind-user.c
@@ -338,27 +338,30 @@ static int user_start_slice(User *u) {
dbus_error_init(&error);
if (!u->slice) {
- char lu[DECIMAL_STR_MAX(unsigned long) + 1];
+ char lu[DECIMAL_STR_MAX(unsigned long) + 1], *slice;
sprintf(lu, "%lu", (unsigned long) u->uid);
- r = build_subslice(SPECIAL_USER_SLICE, lu, &u->slice);
+ r = build_subslice(SPECIAL_USER_SLICE, lu, &slice);
if (r < 0)
return r;
- r = hashmap_put(u->manager->user_units, u->slice, u);
- if (r < 0)
- log_warning("Failed to create mapping between unit and user");
- }
+ r = manager_start_unit(u->manager, slice, &error, &job);
+ if (r < 0) {
+ log_error("Failed to start user slice: %s", bus_error(&error, r));
+ dbus_error_free(&error);
- r = manager_start_unit(u->manager, u->slice, &error, &job);
- if (r < 0) {
- log_error("Failed to start user slice: %s", bus_error(&error, r));
- dbus_error_free(&error);
- } else {
- free(u->slice_job);
- u->slice_job = job;
+ free(slice);
+ } else {
+ u->slice = slice;
+
+ free(u->slice_job);
+ u->slice_job = job;
+ }
}
+ if (u->slice)
+ hashmap_put(u->manager->user_units, u->slice, u);
+
return 0;
}
@@ -372,27 +375,30 @@ static int user_start_service(User *u) {
dbus_error_init(&error);
if (!u->service) {
- char lu[DECIMAL_STR_MAX(unsigned long) + 1];
+ char lu[DECIMAL_STR_MAX(unsigned long) + 1], *service;
sprintf(lu, "%lu", (unsigned long) u->uid);
- u->service = unit_name_build("user", lu, ".service");
- if (!u->service)
+ service = unit_name_build("user", lu, ".service");
+ if (!service)
return log_oom();
- r = hashmap_put(u->manager->user_units, u->service, u);
- if (r < 0)
- log_warning("Failed to create mapping between service and user");
- }
+ r = manager_start_unit(u->manager, service, &error, &job);
+ if (r < 0) {
+ log_error("Failed to start user service: %s", bus_error(&error, r));
+ dbus_error_free(&error);
- r = manager_start_unit(u->manager, u->service, &error, &job);
- if (r < 0) {
- log_error("Failed to start user service: %s", bus_error(&error, r));
- dbus_error_free(&error);
- } else {
- free(u->service_job);
- u->service_job = job;
+ free(service);
+ } else {
+ u->service = service;
+
+ free(u->service_job);
+ u->service_job = job;
+ }
}
+ if (u->service)
+ hashmap_put(u->manager->user_units, u->service, u);
+
return 0;
}