diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2012-12-11 02:44:53 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2012-12-11 02:44:53 +0000 |
| commit | 75a037c7273a9ecc7f3261ad9ecaea41486e339a (patch) | |
| tree | 3e089e018d7ee00d21ee1ed88f2b0aa0f2d63ff9 | |
| parent | 96a510e157e3f972a44fc5268321d9410cd141f7 (diff) | |
Cleanup logger on exit.
* Cleanup CLI commands, destroy verbosers and logchannels lists on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
logger-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
Modified
........
Merged revisions 377771 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377772 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377773 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377774 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | main/logger.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/main/logger.c b/main/logger.c index aad1c9869..7994fb7df 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1257,6 +1257,9 @@ int init_logger(void) void close_logger(void) { struct logchannel *f = NULL; + struct verb *cur = NULL; + + ast_cli_unregister_multiple(cli_logger, ARRAY_LEN(cli_logger)); logger_initialized = 0; @@ -1269,6 +1272,12 @@ void close_logger(void) if (logthread != AST_PTHREADT_NULL) pthread_join(logthread, NULL); + AST_RWLIST_WRLOCK(&verbosers); + while ((cur = AST_LIST_REMOVE_HEAD(&verbosers, list))) { + ast_free(cur); + } + AST_RWLIST_UNLOCK(&verbosers); + AST_RWLIST_WRLOCK(&logchannels); if (qlog) { @@ -1276,11 +1285,12 @@ void close_logger(void) qlog = NULL; } - AST_RWLIST_TRAVERSE(&logchannels, f, list) { + while ((f = AST_LIST_REMOVE_HEAD(&logchannels, list))) { if (f->fileptr && (f->fileptr != stdout) && (f->fileptr != stderr)) { fclose(f->fileptr); f->fileptr = NULL; } + ast_free(f); } closelog(); /* syslog */ |