diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-09-22 19:57:07 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-09-25 14:40:15 +0200 |
| commit | 4db9ee58f14bba794286d1c9926c18815b02b585 (patch) | |
| tree | 8885ea91ae48453504e63fbd38fe873fa965d023 /src/basic | |
| parent | f7dcd51ce43c892abc24c6f22cddddc47feb81a0 (diff) | |
cgroup-util: downgrade log messages from library code to LOG_DEBUG
These errors don't really matter, that's why we log and proceed in the
current code. However, we currently log at LOG_WARNING, but we really
shouldn't given that this is library code. Hence downgrade this to
LOG_DEBUG.
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/cgroup-util.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c index 6b3816437..5fc59d2ef 100644 --- a/src/basic/cgroup-util.c +++ b/src/basic/cgroup-util.c @@ -909,7 +909,7 @@ int cg_set_group_access( if (r > 0 && streq(controller, SYSTEMD_CGROUP_CONTROLLER)) { r = cg_set_group_access(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, mode, uid, gid); if (r < 0) - log_warning_errno(r, "Failed to set group access on compat systemd cgroup %s: %m", path); + log_debug_errno(r, "Failed to set group access on compatibility systemd cgroup %s, ignoring: %m", path); } return 0; @@ -955,9 +955,11 @@ int cg_set_task_access( if (r < 0) return r; if (r > 0 && streq(controller, SYSTEMD_CGROUP_CONTROLLER)) { + /* Always propagate access mode from unified to legacy controller */ + r = cg_set_task_access(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, mode, uid, gid); if (r < 0) - log_warning_errno(r, "Failed to set task access on compat systemd cgroup %s: %m", path); + log_debug_errno(r, "Failed to set task access on compatibility systemd cgroup %s, ignoring: %m", path); } return 0; @@ -1004,7 +1006,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi int cg_pid_get_path(const char *controller, pid_t pid, char **path) { _cleanup_fclose_ FILE *f = NULL; char line[LINE_MAX]; - const char *fs, *controller_str = NULL; + const char *fs, *controller_str; size_t cs = 0; int unified; |