summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2013-01-10 16:48:39 +1100
committerAmitay Isaacs <amitay@gmail.com>2013-05-24 14:08:07 +1000
commit147f6bb4b8138461e6da4c321f171b14c409bc08 (patch)
treee9ff6ece2771ab5e6ea2a93f1dcd31796660b47d /ctdb
parent0e678a73b8a16e29ff62c1e34335c868f9007ff4 (diff)
downloadsamba-147f6bb4b8138461e6da4c321f171b14c409bc08.tar.gz
samba-147f6bb4b8138461e6da4c321f171b14c409bc08.tar.xz
samba-147f6bb4b8138461e6da4c321f171b14c409bc08.zip
ctdbd: Start logging process earlier
Signed-off-by: Martin Schwenke <martin@meltin.net> Pair-programmed-with: Amitay Isaacs <amitay@gmail.com> (This used to be ctdb commit f43fe3a560d5915c1a9893256f4e7bfe3d7e290a)
Diffstat (limited to 'ctdb')
-rw-r--r--ctdb/server/ctdb_daemon.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index f59b9b2edf2..edbc34c7a1f 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1200,6 +1200,12 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog,
}
ctdb_set_child_logging(ctdb);
+ if (use_syslog) {
+ if (start_syslog_daemon(ctdb)) {
+ DEBUG(DEBUG_CRIT, ("Failed to start syslog daemon\n"));
+ exit(10);
+ }
+ }
/* initialize statistics collection */
ctdb_statistics_init(ctdb);
@@ -1303,13 +1309,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog,
exit(1);
}
- if (use_syslog) {
- if (start_syslog_daemon(ctdb)) {
- DEBUG(DEBUG_CRIT, ("Failed to start syslog daemon\n"));
- exit(10);
- }
- }
-
ctdb_lockdown_memory(ctdb);
/* go into a wait loop to allow other nodes to complete */