Prep v235: Fix startup order and add debug logging.

diff --git a/src/login/elogind.c b/src/login/elogind.c
index 1592e0e945cbd6a9b1828223ac7f76525a6957fa..79037a4d922182818e086e7266004d64916df6ab 100644 (file)
--- a/src/login/elogind.c
+++ b/src/login/elogind.c
@@ -77,6 +77,12 @@ static int elogind_daemonize(void) {
         pid_t SID;
         int r;
 
+#ifdef ENABLE_DEBUG_ELOGIND
+        log_notice("Double forking elogind");
+        log_notice("Parent PID     : %5d", getpid_cached());
+        log_notice("Parent SID     : %5d", getsid(getpid_cached()));
+#endif // ENABLE_DEBUG_ELOGIND
+
         child = fork();
 
         if (child < 0)
@@ -92,11 +98,21 @@ static int elogind_daemonize(void) {
                 return child;
         }
 
+#ifdef ENABLE_DEBUG_ELOGIND
+        log_notice("Child PID      : %5d", getpid_cached());
+        log_notice("Child SID      : %5d", getsid(getpid_cached()));
+#endif // ENABLE_DEBUG_ELOGIND
+
         /* The first child has to become a new session leader. */
         close_all_fds(NULL, 0);
         SID = setsid();
         if ((pid_t)-1 == SID)
                 return log_error_errno(errno, "Failed to create new SID: %m");
+
+#ifdef ENABLE_DEBUG_ELOGIND
+        log_notice("Child new SID  : %5d", getsid(getpid_cached()));
+#endif // ENABLE_DEBUG_ELOGIND
+
         umask(0022);
 
         /* Now the grandchild, the true daemon, can be created. */
@@ -112,6 +128,11 @@ static int elogind_daemonize(void) {
         close_all_fds(NULL, 0);
         umask(0022);
 
+#ifdef ENABLE_DEBUG_ELOGIND
+        log_notice("Grand child PID: %5d", getpid_cached());
+        log_notice("Grand child SID: %5d", getsid(getpid_cached()));
+#endif // ENABLE_DEBUG_ELOGIND
+
         /* Take care of our PID-file now */
         write_pid_file();
 
@@ -282,21 +303,30 @@ int elogind_startup(int argc, char *argv[]) {
         } else if (argc > 2)
                 wrong_arg = true;
 
+        /* Note: At this point, the logging is not initialized, so we can not
+                 use log_debug_elogind(). */
+#ifdef ENABLE_DEBUG_ELOGIND
+        log_notice("elogind startup: Daemonize: %s, Show Help: %s, Wrong arg: %s",
+                daemonize ? "True" : "False",
+                show_help ? "True" : "False",
+                wrong_arg ? "True" : "False");
+#endif // ENABLE_DEBUG_ELOGIND
+
         /* try to get some meaningful output in case of an error */
         if (wrong_arg) {
-                fprintf(stderr, "ERROR: Unknown arguments\n");
+                log_error("Unknown arguments");
                 show_help = true;
                 r = -EINVAL;
         }
         if (show_help) {
-                fprintf(stderr, "%s [<-D|--daemon>|<-h|--help>]\n", argv[0]);
+                log_info("%s [<-D|--daemon>|<-h|--help>]", basename(argv[0]));
                 return r;
         }
 
         /* Do not continue if elogind is already running */
         pid = elogind_is_already_running(!daemonize);
         if (pid) {
-                fprintf(stderr, "elogind is already running as PID " PID_FMT "\n", pid);
+                log_error("elogind is already running as PID " PID_FMT, pid);
                 return pid;
         }
 

diff --git a/src/login/logind.c b/src/login/logind.c
index 996be1e472f5c7b35f920528334ef24d76fcb211..a390293af195aacad6a277f2d7cc9f1ef460f01c 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1269,6 +1269,12 @@ int main(int argc, char *argv[]) {
         Manager *m = NULL;
         int r;
 
+#if 1 /// perform extra checks for elogind startup
+        r = elogind_startup(argc, argv);
+        if (r)
+                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
+#endif // 0
+
         elogind_set_program_name(argv[0]);
         log_set_target(LOG_TARGET_AUTO);
         log_set_facility(LOG_AUTH);
@@ -1281,17 +1287,13 @@ int main(int argc, char *argv[]) {
 
         umask(0022);
 
-#if 1 /// elogind has some extra functionality at startup.
-        r = elogind_startup(argc, argv);
-        if (r)
-                return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
-#endif // 1
-
+#if 0 /// elogind has some extra functionality at startup, argc can be != 1
         if (argc != 1) {
                 log_error("This program takes no arguments.");
                 r = -EINVAL;
                 goto finish;
         }
+#endif // 0
 
         r = mac_selinux_init();
         if (r < 0) {