68 lines
2.9 KiB
Diff
68 lines
2.9 KiB
Diff
|
Based on 4774e357268e4a1e9fa82adb0563a538932a4c8e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Miguel Angel Ajo <mangelajo@redhat.com>
|
||
|
|
Date: Mon, 7 Jul 2014 14:20:36 +0200
|
||
|
|
Subject: [PATCH] core: Added support for ERRNO NOTIFY_SOCKET message parsing,
|
||
|
|
and added StatusErrno dbus property along StatusText to
|
||
|
|
allow notification of numeric status condition while
|
||
|
|
degraded service operation or any other special situation.
|
||
|
|
|
||
|
|
---
|
||
|
|
src/core/dbus-service.c | 1 +
|
||
|
|
src/core/service.c | 17 +++++++++++++++++
|
||
|
|
src/core/service.h | 1 +
|
||
|
|
3 files changed, 19 insertions(+)
|
||
|
|
|
||
|
|
diff --git src/core/dbus-service.c src/core/dbus-service.c
|
||
|
|
index 093289f..5a881e8 100644
|
||
|
|
--- src/core/dbus-service.c
|
||
|
|
+++ src/core/dbus-service.c
|
||
|
|
@@ -60,6 +60,7 @@ const sd_bus_vtable bus_service_vtable[] = {
|
||
|
|
SD_BUS_PROPERTY("ControlPID", "u", bus_property_get_pid, offsetof(Service, control_pid), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||
|
|
SD_BUS_PROPERTY("BusName", "s", NULL, offsetof(Service, bus_name), SD_BUS_VTABLE_PROPERTY_CONST),
|
||
|
|
SD_BUS_PROPERTY("StatusText", "s", NULL, offsetof(Service, status_text), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||
|
|
+ SD_BUS_PROPERTY("StatusErrno", "i", NULL, offsetof(Service, status_errno), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||
|
|
SD_BUS_PROPERTY("Result", "s", property_get_result, offsetof(Service, result), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||
|
|
BUS_EXEC_STATUS_VTABLE("ExecMain", offsetof(Service, main_exec_status), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
|
||
|
|
BUS_EXEC_COMMAND_LIST_VTABLE("ExecStartPre", offsetof(Service, exec_command[SERVICE_EXEC_START_PRE]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION),
|
||
|
|
diff --git src/core/service.c src/core/service.c
|
||
|
|
index 0b19767..ace45e2 100644
|
||
|
|
--- src/core/service.c
|
||
|
|
+++ src/core/service.c
|
||
|
|
@@ -2637,6 +2637,23 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
|
||
|
|
free(t);
|
||
|
|
}
|
||
|
|
|
||
|
|
+ /* Interpret ERRNO= */
|
||
|
|
+ e = strv_find_prefix(tags, "ERRNO=");
|
||
|
|
+ if (e) {
|
||
|
|
+ int status_errno;
|
||
|
|
+
|
||
|
|
+ if (safe_atoi(e + 6, &status_errno) < 0)
|
||
|
|
+ log_warning_unit(u->id, "Failed to parse ERRNO= field in notification message: %s", e);
|
||
|
|
+ else {
|
||
|
|
+ log_debug_unit(u->id, "%s: got %s", u->id, e);
|
||
|
|
+
|
||
|
|
+ if (s->status_errno != status_errno) {
|
||
|
|
+ s->status_errno = status_errno;
|
||
|
|
+ notify_dbus = true;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
/* Interpret WATCHDOG= */
|
||
|
|
if (strv_find(tags, "WATCHDOG=1")) {
|
||
|
|
log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id);
|
||
|
|
--- src/core/service.h
|
||
|
|
+++ src/core/service.h 2014-07-08 12:54:39.238736046 +0200
|
||
|
|
@@ -187,6 +187,7 @@ struct Service {
|
||
|
|
char *bus_name;
|
||
|
|
|
||
|
|
char *status_text;
|
||
|
|
+ int status_errno;
|
||
|
|
|
||
|
|
RateLimit start_limit;
|
||
|
|
StartLimitAction start_limit_action;
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|