Merge pull request #1749 from zonque/cmsg

core: two trivial debug/error message improvements

3 files changed, 3 insertions, 3 deletions

diff --git a/src/core/dbus.c b/src/core/dbus.c
index 834745aeb5..6c44b28adf 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -784,7 +784,7 @@ static int bus_setup_api(Manager *m, sd_bus *bus) {
         HASHMAP_FOREACH_KEY(u, name, m->watch_bus, i) {
                 r = unit_install_bus_match(u, bus, name);
                 if (r < 0)
-                        log_error_errno(r, "Failed to subscribe to NameOwnerChanged signal: %m");
+                        log_error_errno(r, "Failed to subscribe to NameOwnerChanged signal for '%s': %m", name);
         }
 
         r = sd_bus_add_match(
diff --git a/src/core/service.c b/src/core/service.c
index bafb532e1e..586eddd99a 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -420,7 +420,7 @@ static int service_add_fd_store_set(Service *s, FDSet *fds, const char *name) {
         }
 
         if (fdset_size(fds) > 0)
-                log_unit_warning(UNIT(s), "Tried to store more fds than FDStoreMax=%u allows, closing remaining.", s->n_fd_store_max);
+                log_unit_warning(UNIT(s), "Tried to store more fds than FileDescriptorStoreMax=%u allows, closing remaining.", s->n_fd_store_max);
 
         return 0;
 }
diff --git a/src/core/unit.c b/src/core/unit.c
index f5ec630de2..6c130d4cd1 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -2511,7 +2511,7 @@ int unit_watch_bus_name(Unit *u, const char *name) {
                  * Otherwise, just put the name in the list. bus_setup_api() will take care later. */
                 r = unit_install_bus_match(u, u->manager->api_bus, name);
                 if (r < 0)
-                        return log_warning_errno(r, "Failed to subscribe to NameOwnerChanged signal: %m");
+                        return log_warning_errno(r, "Failed to subscribe to NameOwnerChanged signal for '%s': %m", name);
         }
 
         r = hashmap_put(u->manager->watch_bus, name, u);