diff options
author | Evgeny Vereshchagin <evvers@ya.ru> | 2015-10-11 03:37:50 +0000 |
---|---|---|
committer | Evgeny Vereshchagin <evvers@ya.ru> | 2015-10-14 14:48:45 +0000 |
commit | a8a1357560aa6b2618dfe65674c9c9179940ef88 (patch) | |
tree | 736d3a9234b549aad0c436957225f2ea1bbf41be /src | |
parent | 9ea79b459edef51e3ccc1ddde07c7b1399bed601 (diff) |
systemd-run: can launch units with SyslogLevel
Diffstat (limited to 'src')
-rw-r--r-- | src/core/dbus-execute.c | 13 | ||||
-rw-r--r-- | src/shared/bus-util.c | 13 |
2 files changed, 25 insertions, 1 deletions
diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c index 88db179958..73290002f6 100644 --- a/src/core/dbus-execute.c +++ b/src/core/dbus-execute.c @@ -881,6 +881,19 @@ int bus_exec_context_set_transient_property( } return 1; + } else if (streq(name, "SyslogLevel")) { + int level; + + r = sd_bus_message_read(message, "i", &level); + if (r < 0) + return r; + + if (mode != UNIT_CHECK) { + c->syslog_priority = (c->syslog_priority & LOG_FACMASK) | level; + unit_write_drop_in_private_format(u, mode, name, "SyslogLevel=%i\n", level); + } + + return 1; } else if (streq(name, "Nice")) { int n; diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c index 65922dd93b..bf9320b0e0 100644 --- a/src/shared/bus-util.c +++ b/src/shared/bus-util.c @@ -1497,7 +1497,18 @@ int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignmen "RootDirectory", "SyslogIdentifier")) r = sd_bus_message_append(m, "v", "s", eq); - else if (streq(field, "DeviceAllow")) { + else if (streq(field, "SyslogLevel")) { + int level; + + level = log_level_from_string(eq); + if (level < 0) { + log_error("Failed to parse %s value %s.", field, eq); + return -EINVAL; + } + + r = sd_bus_message_append(m, "v", "i", level); + + } else if (streq(field, "DeviceAllow")) { if (isempty(eq)) r = sd_bus_message_append(m, "v", "a(ss)", 0); |