diff --git a/src/common/log.c b/src/common/log.c index e85f2c9464..27212aeabc 100644 --- a/src/common/log.c +++ b/src/common/log.c @@ -8,8 +8,11 @@ /* * Changes : * $Log$ - * Revision 1.1 2002/06/26 22:45:50 arma - * Initial revision + * Revision 1.2 2002/07/12 18:14:16 montrose + * removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL); + * + * Revision 1.1.1.1 2002/06/26 22:45:50 arma + * initial commit: current code * * Revision 1.11 2002/06/14 20:44:57 mp292 * *** empty log message *** @@ -54,21 +57,25 @@ #include #include "log.h" -void log_internal(int severity, const char *format, va_list ap); - /* Outputs a message to stdout */ void log(int severity, const char *format, ...) { - extern int loglevel; + static int loglevel = LOG_DEBUG; va_list ap; - va_start(ap,format); - - if (severity <= loglevel) + if ( format ) { - vprintf(format,ap); - printf("\n"); - } + + va_start(ap,format); - va_end(ap); + if (severity <= loglevel) + { + vprintf(format,ap); + printf("\n"); + } + + va_end(ap); + } + else + loglevel = severity; } diff --git a/src/httpap/httpap.c b/src/httpap/httpap.c index 93fb2bc5e0..4467c90333 100644 --- a/src/httpap/httpap.c +++ b/src/httpap/httpap.c @@ -8,6 +8,9 @@ /* * Changes : * $Log$ + * Revision 1.3 2002/07/12 18:14:16 montrose + * removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL); + * * Revision 1.2 2002/07/02 09:16:16 arma * httpap now prepends dest_addr and dest_port strings with their length. * @@ -58,7 +61,6 @@ #include "httpap.h" #include "http.h" -int loglevel = LOG_ERR; struct timeval conn_tout; struct timeval *conn_toutp = &conn_tout; @@ -464,6 +466,7 @@ int handle_connection(int new_sock, struct hostent *local, struct sockaddr_in re int main(int argc, char *argv[]) { + int loglevel = LOG_DEBUG; int retval = 0; char c; /* command-line option */ @@ -522,7 +525,7 @@ int main(int argc, char *argv[]) print_usage(); return 0; break; - case 'l': + case 'l': if (!strcmp(optarg,"emerg")) loglevel = LOG_EMERG; else if (!strcmp(optarg,"alert")) @@ -559,6 +562,8 @@ int main(int argc, char *argv[]) } } + log(loglevel,NULL); /* assign severity level for logger */ + /* the -f option is mandatory */ if (conf_filename == NULL) { diff --git a/src/op/op.c b/src/op/op.c index 06ae999503..797f2f50b9 100644 --- a/src/op/op.c +++ b/src/op/op.c @@ -8,8 +8,11 @@ /* * Changes : * $Log$ - * Revision 1.1 2002/06/26 22:45:50 arma - * Initial revision + * Revision 1.2 2002/07/12 18:14:16 montrose + * removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL); + * + * Revision 1.1.1.1 2002/06/26 22:45:50 arma + * initial commit: current code * * Revision 1.37 2002/06/14 20:45:56 mp292 * *** empty log message *** @@ -163,7 +166,6 @@ /* global variables */ /* default logging threshold */ -int loglevel = LOG_ERR; struct timeval conn_tout; struct timeval *conn_toutp = &conn_tout; @@ -702,6 +704,8 @@ int main(int argc, char *argv[]) int islocal = 0; /* is the incoming connection local? */ struct rlimit cd_limit; /* resource limit to prevent core dumps */ + + log(LOG_ERR,NULL); /* assign severity level for logger */ /* prevent core dump */ retval = getrlimit(RLIMIT_CORE, &cd_limit); diff --git a/src/or/main.c b/src/or/main.c index 671cc72e24..b40ef9ee25 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -4,7 +4,6 @@ /********* START VARIABLES **********/ static or_options_t options; /* command-line and config-file options */ -int loglevel; int global_role; static connection_t *connection_array[MAXCONNECTIONS] = @@ -332,9 +331,8 @@ int main(int argc, char *argv[]) { signal (SIGINT, catch); /* to catch ^c so we can exit cleanly */ if ( getoptions(argc,argv,&options) ) exit(1); - /* assign global vars from options. maybe get rid of these globals later */ - loglevel = options.loglevel; - global_role = options.GlobalRole; + log(options.loglevel,NULL); /* assign logging severity level from options */ + global_role = options.GlobalRole; /* assign global_role from options. FIX: remove from global namespace later. */ ERR_load_crypto_strings(); retval = do_main_loop(); diff --git a/src/or/test_config.c b/src/or/test_config.c index 171adb659a..f9a3fdd400 100644 --- a/src/or/test_config.c +++ b/src/or/test_config.c @@ -1,7 +1,5 @@ #include "or.h" -int loglevel; - int main(int ac, char **av) { or_options_t options; diff --git a/src/smtpap/smtpap.c b/src/smtpap/smtpap.c index 701dde809f..a420268a7c 100644 --- a/src/smtpap/smtpap.c +++ b/src/smtpap/smtpap.c @@ -8,8 +8,11 @@ /* * Changes : * $Log$ - * Revision 1.1 2002/06/26 22:45:50 arma - * Initial revision + * Revision 1.2 2002/07/12 18:14:17 montrose + * removed loglevel from global namespace. severity level is set using log() with a NULL format argument now. example: log(LOG_ERR,NULL); + * + * Revision 1.1.1.1 2002/06/26 22:45:50 arma + * initial commit: current code * * Revision 1.32 2002/04/02 14:29:49 badbytes * Final finishes. @@ -133,7 +136,6 @@ #include "smtpap.h" #include "io.h" -int loglevel = LOG_ERR; struct timeval conn_tout; struct timeval *conn_toutp = &conn_tout; @@ -1141,6 +1143,7 @@ int handle_connection(int s, struct hostent *local, struct sockaddr_in remote, u int main(int argc, char *argv[]) { + int loglevel = LOG_DEBUG; int retval = 0; char c; /* command-line option */ @@ -1166,7 +1169,7 @@ int main(int argc, char *argv[]) struct sigaction sa; char *errtest = NULL; /* for detecting strtoul() errors */ - + /* set default listening port */ p = htons(SMTPAP_LISTEN_PORT); @@ -1198,7 +1201,7 @@ int main(int argc, char *argv[]) print_usage(); return 0; break; - case 'l': + case 'l': if (!strcmp(optarg,"emerg")) loglevel = LOG_EMERG; else if (!strcmp(optarg,"alert")) @@ -1234,7 +1237,9 @@ int main(int argc, char *argv[]) abort(); } } - + + log(loglevel,NULL); /* assign severity level for logger */ + /* the -f option is mandatory */ if (conf_filename == NULL) {