diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-10-15 18:50:16 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-10-15 18:50:16 +0000 |
| commit | 11a23fc280f5fc7a0d4af50ca73f87b96d2dab6f (patch) | |
| tree | 426fd0842e9e7689245b3781513df1ff6257bad6 /src/or/config.c | |
| parent | 695920d09fb405b04f6798a1f6b236cba9e08a5f (diff) | |
| download | tor-11a23fc280f5fc7a0d4af50ca73f87b96d2dab6f.tar.gz tor-11a23fc280f5fc7a0d4af50ca73f87b96d2dab6f.zip | |
clean up logging, allow user to specify log files
If DebugLogFile is specified, log to it at -l debug
If LogFile is specified, log to it at the -l from the commandline
(default info)
If no LogFile *and* not a Daemon, then log to stdout.
Make conn->s = -1 by default (this might break things)
When kill -USR1, prefer to log at INFO, but make sure they always see it.
svn:r596
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 2402a64e9b..977af49816 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -151,6 +151,8 @@ static void config_assign(or_options_t *options, struct config_line *list) { /* string options */ config_compare(list, "LogLevel", CONFIG_TYPE_STRING, &options->LogLevel) || + config_compare(list, "LogFile", CONFIG_TYPE_STRING, &options->LogFile) || + config_compare(list, "DebugLogFile", CONFIG_TYPE_STRING, &options->DebugLogFile) || config_compare(list, "DataDirectory", CONFIG_TYPE_STRING, &options->DataDirectory) || config_compare(list, "RouterFile", CONFIG_TYPE_STRING, &options->RouterFile) || config_compare(list, "PidFile", CONFIG_TYPE_STRING, &options->PidFile) || @@ -171,10 +173,10 @@ static void config_assign(or_options_t *options, struct config_line *list) { config_compare(list, "NumCpus", CONFIG_TYPE_INT, &options->NumCpus) || config_compare(list, "OnionRouter", CONFIG_TYPE_BOOL, &options->OnionRouter) || - config_compare(list, "Daemon", CONFIG_TYPE_BOOL, &options->Daemon) || config_compare(list, "TrafficShaping", CONFIG_TYPE_BOOL, &options->TrafficShaping) || config_compare(list, "LinkPadding", CONFIG_TYPE_BOOL, &options->LinkPadding) || config_compare(list, "IgnoreVersion", CONFIG_TYPE_BOOL, &options->IgnoreVersion) || + config_compare(list, "RunAsDaemon", CONFIG_TYPE_BOOL, &options->RunAsDaemon) || /* float options */ config_compare(list, "CoinWeight", CONFIG_TYPE_DOUBLE, &options->CoinWeight) @@ -201,7 +203,7 @@ int getconfig(int argc, char **argv, or_options_t *options) { memset(options,0,sizeof(or_options_t)); options->LogLevel = "info"; options->ExitPolicy = "reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*"; - options->loglevel = LOG_DEBUG; + options->loglevel = LOG_INFO; options->PidFile = "tor.pid"; options->DataDirectory = NULL; options->CoinWeight = 0.1; |