summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-12-23 00:29:14 +0100
committerMichael Adam <obnox@samba.org>2009-12-23 00:31:55 +0100
commit71a035d619025910bcff350c84fd96eb2d7f2c66 (patch)
treebbd884baf8c83550828b9ba1e86ec72c38ce7f24
parentbc1047945272235208fddcda71d8f25e3063e589 (diff)
downloadtinyproxy-71a035d619025910bcff350c84fd96eb2d7f2c66.tar.gz
tinyproxy-71a035d619025910bcff350c84fd96eb2d7f2c66.zip
Use reload_config() in main() to load config and init logging.
Michael
-rw-r--r--src/main.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index ca9487b..cdc6eb0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -360,13 +360,7 @@ main (int argc, char **argv)
log_message (LOG_INFO, "Initializing " PACKAGE " ...");
- ret = reload_config_file(config_defaults.config_file, &config,
- &config_defaults);
- if (ret != 0) {
- exit (EX_SOFTWARE);
- }
-
- ret = setup_logging ();
+ ret = reload_config ();
if (ret != 0) {
exit (EX_SOFTWARE);
}