aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-05-20 19:47:28 +0000
committerNick Mathewson <nickm@torproject.org>2004-05-20 19:47:28 +0000
commitccb825128e60e924c9f2c106d94c4519d4393d8e (patch)
tree08735f6d83ef316b1ed81bdcf1d1650295a5f213 /src/or/main.c
parent1c21a02b90a7cef6d56589194f22b2a7f4f35f95 (diff)
downloadtor-ccb825128e60e924c9f2c106d94c4519d4393d8e.tar
tor-ccb825128e60e924c9f2c106d94c4519d4393d8e.tar.gz
Tinker with log behavior: never send error messages about logs into the bitbucket
svn:r1912
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 50280f074..eb7a1a05f 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -567,7 +567,9 @@ static int init_from_config(int argc, char **argv) {
close_logs(); /* we'll close, then open with correct loglevel if necessary */
/* Configure the log(s) */
- config_init_logs(&options);
+ if (config_init_logs(&options)<0)
+ return -1;
+ close_temp_logs();
/* Set up our buckets */
connection_bucket_init();
@@ -853,7 +855,7 @@ void exit_function(void)
int tor_main(int argc, char *argv[]) {
/* give it somewhere to log to initially */
- add_stream_log(LOG_NOTICE, LOG_ERR, "<stdout>", stdout);
+ add_temp_log();
log_fn(LOG_NOTICE,"Tor v%s. This is experimental software. Do not use it if you need anonymity.",VERSION);
if (network_init()<0) {