diff options
| author | Martin Willi <martin@strongswan.org> | 2005-12-04 11:46:58 +0000 |
|---|---|---|
| committer | Martin Willi <martin@strongswan.org> | 2005-12-04 11:46:58 +0000 |
| commit | 25c41f4df7079b64ba53184e47edbc012ae96123 (patch) | |
| tree | 93d1ff241cd7bf140c4780478750a20316a9c516 /Source/charon/utils/logger_manager.c | |
| parent | 26cfe75e4d4266c75ad6adb5244beec6731e6956 (diff) | |
| download | strongswan-25c41f4df7079b64ba53184e47edbc012ae96123.tar.bz2 strongswan-25c41f4df7079b64ba53184e47edbc012ae96123.tar.xz | |
- logging cleanup
- pid re-replaced with thread_ids, since nptl does not distinguish pids between threads
Diffstat (limited to 'Source/charon/utils/logger_manager.c')
| -rw-r--r-- | Source/charon/utils/logger_manager.c | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/Source/charon/utils/logger_manager.c b/Source/charon/utils/logger_manager.c index 91f83a7f4..f5ebc7d01 100644 --- a/Source/charon/utils/logger_manager.c +++ b/Source/charon/utils/logger_manager.c @@ -43,6 +43,8 @@ mapping_t logger_context_t_mappings[] = { {DAEMON, "DAEMON"}, {CONFIGURATION_MANAGER, "CONFIG"}, {ENCRYPTION_PAYLOAD, "ENCPLD"}, + {PRIME_POOL, "PRIMEP"}, + {MAPPING_END, NULL}, }; /** @@ -137,40 +139,56 @@ static logger_t *create_logger(private_logger_manager_t *this, logger_context_t /* output to stdout, since we are debugging all days */ output = stdout; + + /* defaults */ + log_thread_ids = FALSE; + logger_level = this->public.get_logger_level(&(this->public),context);; switch(context) { case TESTER: - log_thread_ids = FALSE; output = stdout; - logger_level |= FULL; break; - case IKE_SA: - logger_level |= FULL; case IKE_SA_MANAGER: - case WORKER: + log_thread_ids = TRUE; + break; + case IKE_SA: + log_thread_ids = TRUE; + break; case CONFIGURATION_MANAGER: - logger_level |= ALL; + log_thread_ids = TRUE; + break; case MESSAGE: + log_thread_ids = TRUE; + break; case ENCRYPTION_PAYLOAD: - + log_thread_ids = TRUE; + break; case GENERATOR: + log_thread_ids = TRUE; + break; + case PARSER: + log_thread_ids = TRUE; + break; + case WORKER: + log_thread_ids = TRUE; + break; case THREAD_POOL: + break; + case PRIME_POOL: + break; case SCHEDULER: + break; case SENDER: + break; case RECEIVER: + break; case SOCKET: + break; case DAEMON: - logger_level |= CONTROL; - case PARSER: - log_thread_ids = FALSE; - logger_level |= ERROR; break; } - /* reduce to global definiton of loglevel */ - logger_level &= this->public.get_logger_level(&(this->public),context); - /* logger manager is thread save */ pthread_mutex_lock(&(this->mutex)); if (name != NULL) |