journal: set the _SYSTEMD_UNIT field for messages from terminated processes

[elogind.git] / src / core / service.c

diff --git a/src/core/service.c b/src/core/service.c
index 5d82e9b545172516147b59956ac8e386bfd64852..eeabe8fb01ec83b22ee653479360f1be95d39d3e 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -108,6 +108,26 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING
 };
 
         [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING
 };
 

+/* For Type=idle we never want to delay any other jobs, hence we
+ * consider idle jobs active as soon as we start working on them */
+static const UnitActiveState state_translation_table_idle[_SERVICE_STATE_MAX] = {
+        [SERVICE_DEAD] = UNIT_INACTIVE,
+        [SERVICE_START_PRE] = UNIT_ACTIVE,
+        [SERVICE_START] = UNIT_ACTIVE,
+        [SERVICE_START_POST] = UNIT_ACTIVE,
+        [SERVICE_RUNNING] = UNIT_ACTIVE,
+        [SERVICE_EXITED] = UNIT_ACTIVE,
+        [SERVICE_RELOAD] = UNIT_RELOADING,
+        [SERVICE_STOP] = UNIT_DEACTIVATING,
+        [SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING,
+        [SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING,
+        [SERVICE_STOP_POST] = UNIT_DEACTIVATING,
+        [SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING,
+        [SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING,
+        [SERVICE_FAILED] = UNIT_FAILED,
+        [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING
+};
+

 static void service_init(Unit *u) {
         Service *s = SERVICE(u);
         int i;
 static void service_init(Unit *u) {
         Service *s = SERVICE(u);
         int i;


@@ -264,9 +284,6 @@ static void service_done(Unit *u) {
         s->pid_file = NULL;
 
 #ifdef HAVE_SYSV_COMPAT
         s->pid_file = NULL;
 
 #ifdef HAVE_SYSV_COMPAT

-        free(s->sysv_path);
-        s->sysv_path = NULL;
-

         free(s->sysv_runlevels);
         s->sysv_runlevels = NULL;
 #endif
         free(s->sysv_runlevels);
         s->sysv_runlevels = NULL;
 #endif


@@ -504,17 +521,21 @@ static int sysv_exec_commands(Service *s) {
         ExecCommand *c;
 
         assert(s);
         ExecCommand *c;
 
         assert(s);

-        assert(s->sysv_path);
+        assert(s->is_sysv);
+        assert(UNIT(s)->source_path);

 
 

-        if (!(c = exec_command_new(s->sysv_path, "start")))
+        c = exec_command_new(UNIT(s)->source_path, "start");
+        if (!c)

                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_START, c);
 
                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_START, c);
 

-        if (!(c = exec_command_new(s->sysv_path, "stop")))
+        c = exec_command_new(UNIT(s)->source_path, "stop");
+        if (!c)

                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_STOP, c);
 
                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_STOP, c);
 

-        if (!(c = exec_command_new(s->sysv_path, "reload")))
+        c = exec_command_new(UNIT(s)->source_path, "reload");
+        if (!c)

                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_RELOAD, c);
 
                 return -ENOMEM;
         exec_command_append_list(s->exec_command+SERVICE_EXEC_RELOAD, c);
 


@@ -540,7 +561,8 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
         u = UNIT(s);
 
 
         u = UNIT(s);
 

-        if (!(f = fopen(path, "re"))) {
+        f = fopen(path, "re");
+        if (!f) {

                 r = errno == ENOENT ? 0 : -errno;
                 goto finish;
         }
                 r = errno == ENOENT ? 0 : -errno;
                 goto finish;
         }


@@ -551,13 +573,13 @@ static int service_load_sysv_path(Service *s, const char *path) {
                 goto finish;
         }
 
                 goto finish;
         }
 

-        free(s->sysv_path);
-        if (!(s->sysv_path = strdup(path))) {
+        free(u->source_path);
+        u->source_path = strdup(path);
+        if (!u->source_path) {

                 r = -ENOMEM;
                 goto finish;
         }
                 r = -ENOMEM;
                 goto finish;
         }

-
-        s->sysv_mtime = timespec_load(&st.st_mtim);
+        u->source_mtime = timespec_load(&st.st_mtim);

 
         if (null_or_empty(&st)) {
                 u->load_state = UNIT_MASKED;
 
         if (null_or_empty(&st)) {
                 u->load_state = UNIT_MASKED;


@@ -565,6 +587,8 @@ static int service_load_sysv_path(Service *s, const char *path) {
                 goto finish;
         }
 
                 goto finish;
         }
 

+        s->is_sysv = true;
+

         while (!feof(f)) {
                 char l[LINE_MAX], *t;
 
         while (!feof(f)) {
                 char l[LINE_MAX], *t;
 


@@ -1225,6 +1249,10 @@ static int service_load(Unit *u) {
                 if (s->type == _SERVICE_TYPE_INVALID)
                         s->type = s->bus_name ? SERVICE_DBUS : SERVICE_SIMPLE;
 
                 if (s->type == _SERVICE_TYPE_INVALID)
                         s->type = s->bus_name ? SERVICE_DBUS : SERVICE_SIMPLE;
 

+                /* Oneshot services have disabled timeout by default */
+                if (s->type == SERVICE_ONESHOT && !s->timeout_defined)
+                        s->timeout_usec = 0;
+

                 service_fix_output(s);
 
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                 service_fix_output(s);
 
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)


@@ -1337,12 +1365,10 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
         }
 
 #ifdef HAVE_SYSV_COMPAT
         }
 
 #ifdef HAVE_SYSV_COMPAT

-        if (s->sysv_path)
+        if (s->is_sysv)

                 fprintf(f,
                 fprintf(f,

-                        "%sSysV Init Script Path: %s\n"

                         "%sSysV Init Script has LSB Header: %s\n"
                         "%sSysVEnabled: %s\n",
                         "%sSysV Init Script has LSB Header: %s\n"
                         "%sSysVEnabled: %s\n",

-                        prefix, s->sysv_path,

                         prefix, yes_no(s->sysv_has_lsb),
                         prefix, yes_no(s->sysv_enabled));
 
                         prefix, yes_no(s->sysv_has_lsb),
                         prefix, yes_no(s->sysv_enabled));
 


@@ -1469,8 +1495,11 @@ static void service_notify_sockets_dead(Service *s, bool failed_permanent) {
 
 static void service_set_state(Service *s, ServiceState state) {
         ServiceState old_state;
 
 static void service_set_state(Service *s, ServiceState state) {
         ServiceState old_state;

+        const UnitActiveState *table;

         assert(s);
 
         assert(s);
 

+        table = s->type == SERVICE_IDLE ? state_translation_table_idle : state_translation_table;
+

         old_state = s->state;
         s->state = state;
 
         old_state = s->state;
         s->state = state;
 


@@ -1553,7 +1582,7 @@ static void service_set_state(Service *s, ServiceState state) {
         if (old_state != state)
                 log_debug("%s changed %s -> %s", UNIT(s)->id, service_state_to_string(old_state), service_state_to_string(state));
 
         if (old_state != state)
                 log_debug("%s changed %s -> %s", UNIT(s)->id, service_state_to_string(old_state), service_state_to_string(state));
 

-        unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], s->reload_result == SERVICE_SUCCESS);
+        unit_notify(UNIT(s), table[old_state], table[state], s->reload_result == SERVICE_SUCCESS);

         s->reload_result = SERVICE_SUCCESS;
 }
 
         s->reload_result = SERVICE_SUCCESS;
 }
 


@@ -1781,6 +1810,7 @@ static int service_spawn(
                        UNIT(s)->cgroup_bondings,
                        UNIT(s)->cgroup_attributes,
                        is_control ? "control" : NULL,
                        UNIT(s)->cgroup_bondings,
                        UNIT(s)->cgroup_attributes,
                        is_control ? "control" : NULL,

+                       UNIT(s)->id,

                        s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
                        &pid);
 
                        s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
                        &pid);
 


@@ -2132,7 +2162,7 @@ static void service_enter_start(Service *s) {
 
         r = service_spawn(s,
                           c,
 
         r = service_spawn(s,
                           c,

-                          s->type == SERVICE_FORKING || s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY,
+                          s->type == SERVICE_FORKING || s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY || s->type == SERVICE_ONESHOT,

                           true,
                           true,
                           true,
                           true,
                           true,
                           true,


@@ -2347,7 +2377,7 @@ static void service_run_next_main(Service *s) {
 
         r = service_spawn(s,
                           s->main_command,
 
         r = service_spawn(s,
                           s->main_command,

-                          false,
+                          true,

                           true,
                           true,
                           true,
                           true,
                           true,
                           true,


@@ -2692,9 +2722,13 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
 }
 
 static UnitActiveState service_active_state(Unit *u) {
 }
 
 static UnitActiveState service_active_state(Unit *u) {

+        const UnitActiveState *table;
+

         assert(u);
 
         assert(u);
 

-        return state_translation_table[SERVICE(u)->state];
+        table = SERVICE(u)->type == SERVICE_IDLE ? state_translation_table_idle : state_translation_table;
+
+        return table[SERVICE(u)->state];

 }
 
 static const char *service_sub_state_to_string(Unit *u) {
 }
 
 static const char *service_sub_state_to_string(Unit *u) {


@@ -2716,7 +2750,7 @@ static bool service_check_gc(Unit *u) {
                 return true;
 
 #ifdef HAVE_SYSV_COMPAT
                 return true;
 
 #ifdef HAVE_SYSV_COMPAT

-        if (s->sysv_path)
+        if (s->is_sysv)

                 return true;
 #endif
 
                 return true;
 #endif
 


@@ -3626,29 +3660,6 @@ static void service_reset_failed(Unit *u) {
         s->reload_result = SERVICE_SUCCESS;
 }
 
         s->reload_result = SERVICE_SUCCESS;
 }
 

-static bool service_need_daemon_reload(Unit *u) {
-        Service *s = SERVICE(u);
-
-        assert(s);
-
-#ifdef HAVE_SYSV_COMPAT
-        if (s->sysv_path) {
-                struct stat st;
-
-                zero(st);
-                if (stat(s->sysv_path, &st) < 0)
-                        /* What, cannot access this anymore? */
-                        return true;
-
-                if (s->sysv_mtime > 0 &&
-                    timespec_load(&st.st_mtim) != s->sysv_mtime)
-                        return true;
-        }
-#endif
-
-        return false;
-}
-

 static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
         Service *s = SERVICE(u);
         int r = 0;
 static int service_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError *error) {
         Service *s = SERVICE(u);
         int r = 0;


@@ -3826,8 +3837,6 @@ const UnitVTable service_vtable = {
 
         .reset_failed = service_reset_failed,
 
 
         .reset_failed = service_reset_failed,
 

-        .need_daemon_reload = service_need_daemon_reload,
-

         .cgroup_notify_empty = service_cgroup_notify_event,
         .notify_message = service_notify_message,
 
         .cgroup_notify_empty = service_cgroup_notify_event,
         .notify_message = service_notify_message,