reword a few log messages

diff --git a/src/main.c b/src/main.c
index 536045591207dba61bad727ba3144c6feb66d4ea..d2411447f7349df11489615369ce35472a20684f 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -284,7 +284,7 @@ static int parse_proc_cmdline_word(const char *word) {
                 log_warning("Unknown kernel switch %s. Ignoring.", word);
 
                 log_info("Supported kernel switches:");
                 log_warning("Unknown kernel switch %s. Ignoring.", word);
 
                 log_info("Supported kernel switches:");

-                log_info("systemd.default=UNIT                     Default unit to start");
+                log_info("systemd.default_unit=UNIT                Default unit to start");

                 log_info("systemd.log_target=console|kmsg|syslog   Log target");
                 log_info("systemd.log_level=LEVEL                  Log level");
                 log_info("systemd.dump_core=0|1                    Dump core on crash");
                 log_info("systemd.log_target=console|kmsg|syslog   Log target");
                 log_info("systemd.log_level=LEVEL                  Log level");
                 log_info("systemd.dump_core=0|1                    Dump core on crash");

diff --git a/src/service.c b/src/service.c
index 651f7c82ca484e730bc587c427c5cc15456bddf3..e1975eb119112c4e7c7d8b9adc72201714969454 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -1377,7 +1377,7 @@ static void service_enter_stop_post(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run stop-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 


@@ -1473,7 +1473,7 @@ static void service_enter_stop(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run stop executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'stop' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
 }
 


@@ -1518,7 +1518,7 @@ static void service_enter_start_post(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start-post executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_stop(s, false);
 }
 
         service_enter_stop(s, false);
 }
 


@@ -1584,7 +1584,7 @@ static void service_enter_start(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start exectuable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 
         service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 }
 


@@ -1613,7 +1613,7 @@ static void service_enter_start_pre(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run start-pre executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_dead(s, false, true);
 }
 
         service_enter_dead(s, false, true);
 }
 


@@ -1660,7 +1660,7 @@ static void service_enter_reload(Service *s) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run reload executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run 'reload' task: %s", UNIT(s)->meta.id, strerror(-r));

         service_enter_stop(s, false);
 }
 
         service_enter_stop(s, false);
 }
 


@@ -1690,7 +1690,7 @@ static void service_run_next(Service *s, bool success) {
         return;
 
 fail:
         return;
 
 fail:

-        log_warning("%s failed to run spawn next executable: %s", UNIT(s)->meta.id, strerror(-r));
+        log_warning("%s failed to run spawn next task: %s", UNIT(s)->meta.id, strerror(-r));

 
         if (s->state == SERVICE_START_PRE)
                 service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
 
         if (s->state == SERVICE_START_PRE)
                 service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);