From 9da4ace1d9789d300ab298bc34694c44b2062f30 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Oct 2010 14:19:32 +1100 Subject: s3-debug Impove setup_logging() to specify logging to stderr This change improves the setup_logging() API so that callers which wish to set up logging to stderr can simply ask for it, rather than directly modify the dbf global variable. Andrew Bartlett --- source3/web/swat.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source3/web/swat.c') diff --git a/source3/web/swat.c b/source3/web/swat.c index 1250204d03..531cf3f411 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -1413,12 +1413,12 @@ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid) /* we don't want any SIGPIPE messages */ BlockSignals(True,SIGPIPE); - dbf = x_fopen("/dev/null", O_WRONLY, 0); - if (!dbf) dbf = x_stderr; + debug_set_logfile("/dev/null"); /* we don't want stderr screwing us up */ close(2); open("/dev/null", O_WRONLY); + setup_logging("swat", DEBUG_FILE); pc = poptGetContext("swat", argc, (const char **) argv, long_options, 0); @@ -1429,9 +1429,10 @@ const char *lang_msg_rotate(TALLOC_CTX *ctx, const char *msgid) poptFreeContext(pc); load_case_tables(); - - setup_logging(argv[0],False); + + /* This should set a more apporiate log file */ load_config(True); + reopen_logs(); load_interfaces(); iNumNonAutoPrintServices = lp_numservices(); load_printers(server_event_context(), server_messaging_context()); -- cgit