diff options
author | Martin Willi <martin@strongswan.org> | 2006-03-23 15:25:43 +0000 |
---|---|---|
committer | Martin Willi <martin@strongswan.org> | 2006-03-23 15:25:43 +0000 |
commit | dec598220b9a293c4ec75e593ab642a8945fa4fc (patch) | |
tree | a97247afbdb29e2b071933f8c9667a7ffa03cca3 /Source/charon/threads/scheduler.c | |
parent | 3264ce50b912f2aba09d2d8e7ee7ed9d364d9e46 (diff) | |
download | strongswan-dec598220b9a293c4ec75e593ab642a8945fa4fc.tar.bz2 strongswan-dec598220b9a293c4ec75e593ab642a8945fa4fc.tar.xz |
- rewrite of logger_manager, uses now one instance per context
- cleanups for logger here and there
- removed critical flag check in payload verification (conformance to IKEv2)
- so thats and theres everywere... ;-)
Diffstat (limited to 'Source/charon/threads/scheduler.c')
-rw-r--r-- | Source/charon/threads/scheduler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/charon/threads/scheduler.c b/Source/charon/threads/scheduler.c index 8205cfd45..8750cdae9 100644 --- a/Source/charon/threads/scheduler.c +++ b/Source/charon/threads/scheduler.c @@ -96,9 +96,7 @@ static void destroy(private_scheduler_t *this) pthread_cancel(this->assigned_thread); pthread_join(this->assigned_thread, NULL); - this->logger->log(this->logger, CONTROL | LEVEL1, "Scheduler thread terminated"); - - charon->logger_manager->destroy_logger(charon->logger_manager, this->logger); + this->logger->log(this->logger, CONTROL | LEVEL1, "Scheduler thread terminated"); allocator_free(this); } @@ -113,13 +111,12 @@ scheduler_t * scheduler_create() this->public.destroy = (void(*)(scheduler_t*)) destroy; this->get_events = get_events; - this->logger = charon->logger_manager->create_logger(charon->logger_manager, SCHEDULER, NULL); + this->logger = charon->logger_manager->get_logger(charon->logger_manager, SCHEDULER); if (pthread_create(&(this->assigned_thread), NULL, (void*(*)(void*))this->get_events, this) != 0) { /* thread could not be created */ this->logger->log(this->logger, ERROR, "Scheduler thread could not be created!"); - charon->logger_manager->destroy_logger(charon->logger_manager, this->logger); allocator_free(this); charon->kill(charon, "Unable to create scheduler thread"); } |