Merged revisions 377774 via svnmerge from

file:///srv/subversion/repos/asterisk/trunk

................
  r377774 | rmudgett | 2012-12-10 20:44:53 -0600 (Mon, 10 Dec 2012) | 19 lines

  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/team/mmichelson/threadpool@377781 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/logger.c b/main/logger.c
index aad1c986918f21e5bef50144408484c31fb5adcf..7994fb7dfe92a01fe0287efacf35214d6065b9bf 100644 (file)
--- 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 */