Open journal before daemonizing, so we can fail in foreground

Just like we open server.log.  Also permits calling journal_prng()
right where we seed the PRNG.

diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c
index 181df364f236e97012447818c6e9d17144d4dac7..7d8e89d0797874fad5e556492d485a3f23636f3c 100644 (file)
--- a/src/lib/subs/journal.c
+++ b/src/lib/subs/journal.c
@@ -27,7 +27,7 @@
  *  journal.c: Log a journal of events to a file
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2012
  *     Ron Koenderink, 2008
  */
 
@@ -82,12 +82,14 @@ static void
 journal_entry_vstart(char *fmt, va_list ap)
 {
     time_t now;
+    empth_t *self;
 
     if (!journal)
        return;
     time(&now);
+    self = empth_self();
     fprintf(journal, "%.24s %10.10s ",
-           ctime(&now), empth_name(empth_self()));
+           ctime(&now), self ? empth_name(self) : "Main");
     vfprintf(journal, fmt, ap);
 }
 

diff --git a/src/server/main.c b/src/server/main.c
index cbf1008db6b35c4757afaa15715a27a30da4d8d8..4983dcf8700f374c0e1cdb3f2b6f8c5169ca2a58 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -31,7 +31,7 @@
  *     Steve McClure, 1996, 1998
  *     Doug Hay, 1998
  *     Ron Koenderink, 2004-2009
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2012
  */
 
 #include <config.h>
@@ -286,7 +286,6 @@ main(int argc, char **argv)
     }
 #endif /* !_WIN32 */
     start_server(flags);
-    journal_prng(seed);
 
     for (;;) {
        sig = empth_wait_for_signal();
@@ -359,6 +358,9 @@ init_server(unsigned seed, int force_bad_state)
     io_init();
     init_nreport();
 
+    if (journal_startup() < 0)
+       exit(1);
+    journal_prng(seed);
     loginit("server");
 }
 
@@ -377,9 +379,6 @@ start_server(int flags)
 
     empth_init((void **)&player, flags);
 
-    if (journal_startup() < 0)
-       exit(1);
-
     update_lock = empth_rwlock_create("Update");
     shutdown_lock = empth_rwlock_create("Shutdown");
     if (!update_lock || !shutdown_lock)