From efc3a8e6e25734db33a890fb729fa05cfd290583 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 4 Aug 2012 20:15:15 +0200 Subject: [PATCH] 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. --- src/lib/subs/journal.c | 6 ++++-- src/server/main.c | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lib/subs/journal.c b/src/lib/subs/journal.c index 181df364..7d8e89d0 100644 --- 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 cbf1008d..4983dcf8 100644 --- 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 @@ -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)