dbus: log received message only once, in filter function

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index d6897341645c057d0ff2cb01670a0d777e9b7d5e..fed8227299279ec11e0370465f90318825fde23f 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -36,7 +36,6 @@
 
 #define COMMENTS "#;\n"
 #define NEWLINES "\n\r"
-#define LINE_MAX 4096
 
 typedef enum RunlevelType {
         RUNLEVEL_UP,
@@ -457,7 +456,8 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         s->sysv_runlevels = d;
                                 }
 
-                        } else if (startswith_no_case(t, "description:")) {
+                        } else if (startswith_no_case(t, "description:") &&
+                                   !u->meta.description) {
 
                                 size_t k = strlen(t);
                                 char *d;
@@ -526,7 +526,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB;
 
-                                FOREACH_WORD(w, z, t+9, i) {
+                                FOREACH_WORD_QUOTED(w, z, t+9, i) {
                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {
@@ -563,7 +563,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB;
 
-                                FOREACH_WORD(w, z, strchr(t, ':')+1, i) {
+                                FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) {
                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {
@@ -603,9 +603,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         s->sysv_runlevels = d;
                                 }
 
-                        } else if (startswith_no_case(t, "Description:")) {
+                        } else if (startswith_no_case(t, "Description:") &&
+                                   !u->meta.description) {
                                 char *d;
 
+                                /* We use the long description only if
+                                 * no short description is set. */
+
                                 state = LSB_DESCRIPTION;
 
                                 if (!(d = strdup(strstrip(t+12)))) {
@@ -616,13 +620,9 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                 free(u->meta.description);
                                 u->meta.description = d;
 
-                        } else if (startswith_no_case(t, "Short-Description:") &&
-                                   !u->meta.description) {
+                        } else if (startswith_no_case(t, "Short-Description:")) {
                                 char *d;
 
-                                /* We use the short description only
-                                 * if no long description is set. */
-
                                 state = LSB;
 
                                 if (!(d = strdup(strstrip(t+18)))) {
@@ -685,6 +685,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->valid_no_process = true;
         s->kill_mode = KILL_PROCESS_GROUP;
         s->restart = SERVICE_ONCE;
+        s->exec_context.std_output = EXEC_OUTPUT_TTY;
 
         u->meta.load_state = UNIT_LOADED;
         r = 0;
@@ -1971,6 +1972,28 @@ static int service_serialize(Unit *u, FILE *f, FDSet *fds) {
                 unit_serialize_item_format(u, f, "socket-fd", "%i", copy);
         }
 
+        if (s->main_exec_status.pid > 0) {
+                unit_serialize_item_format(u, f, "main-exec-status-pid", "%lu", (unsigned long) s->main_exec_status.pid);
+
+                if (s->main_exec_status.start_timestamp.realtime > 0) {
+                        unit_serialize_item_format(u, f, "main-exec-status-start-realtime",
+                                                   "%llu", (unsigned long long) s->main_exec_status.start_timestamp.realtime);
+
+                        unit_serialize_item_format(u, f, "main-exec-status-start-monotonic",
+                                                   "%llu", (unsigned long long) s->main_exec_status.start_timestamp.monotonic);
+                }
+
+                if (s->main_exec_status.exit_timestamp.realtime > 0) {
+                        unit_serialize_item_format(u, f, "main-exec-status-exit-realtime",
+                                                   "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.realtime);
+                        unit_serialize_item_format(u, f, "main-exec-status-exit-monotonic",
+                                                   "%llu", (unsigned long long) s->main_exec_status.exit_timestamp.monotonic);
+
+                        unit_serialize_item_format(u, f, "main-exec-status-code", "%i", s->main_exec_status.code);
+                        unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status);
+                }
+        }
+
         return 0;
 }
 
@@ -2038,6 +2061,55 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
                                 close_nointr_nofail(s->socket_fd);
                         s->socket_fd = fdset_remove(fds, fd);
                 }
+        } else if (streq(key, "main-exec-status-pid")) {
+                pid_t pid;
+
+                if ((r = parse_pid(value, &pid)) < 0)
+                        log_debug("Failed to parse main-exec-status-pid value %s", value);
+                else
+                        s->main_exec_status.pid = pid;
+        } else if (streq(key, "main-exec-status-code")) {
+                int i;
+
+                if ((r = safe_atoi(value, &i)) < 0)
+                        log_debug("Failed to parse main-exec-status-code value %s", value);
+                else
+                        s->main_exec_status.code = i;
+        } else if (streq(key, "main-exec-status-status")) {
+                int i;
+
+                if ((r = safe_atoi(value, &i)) < 0)
+                        log_debug("Failed to parse main-exec-status-status value %s", value);
+                else
+                        s->main_exec_status.status = i;
+        } else if (streq(key, "main-exec-status-start-realtime")) {
+                uint64_t k;
+
+                if ((r = safe_atou64(value, &k)) < 0)
+                        log_debug("Failed to parse main-exec-status-start-realtime value %s", value);
+                else
+                        s->main_exec_status.start_timestamp.realtime = (usec_t) k;
+        } else if (streq(key, "main-exec-status-start-monotonic")) {
+                uint64_t k;
+
+                if ((r = safe_atou64(value, &k)) < 0)
+                        log_debug("Failed to parse main-exec-status-start-monotonic value %s", value);
+                else
+                        s->main_exec_status.start_timestamp.monotonic = (usec_t) k;
+        } else if (streq(key, "main-exec-status-exit-realtime")) {
+                uint64_t k;
+
+                if ((r = safe_atou64(value, &k)) < 0)
+                        log_debug("Failed to parse main-exec-status-exit-realtime value %s", value);
+                else
+                        s->main_exec_status.exit_timestamp.realtime = (usec_t) k;
+        } else if (streq(key, "main-exec-status-exit-monotonic")) {
+                uint64_t k;
+
+                if ((r = safe_atou64(value, &k)) < 0)
+                        log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value);
+                else
+                        s->main_exec_status.exit_timestamp.monotonic = (usec_t) k;
         } else
                 log_debug("Unknown serialization key '%s'", key);
 
@@ -2302,7 +2374,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
                 break;
 
         case SERVICE_AUTO_RESTART:
-                log_debug("%s holdoff time over, scheduling restart.", u->meta.id);
+                log_info("%s holdoff time over, scheduling restart.", u->meta.id);
                 service_enter_restart(s);
                 break;