[svn-commits] rmudgett: trunk r377040 - in /trunk: ./ main/ccss.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Mon Dec  3 11:10:40 2012
New Revision: 377040

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=377040
Log:
Fix CCSS CLI commands and logger level not unregistered.

(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
      ccss-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
........

Merged revisions 377037 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 377038 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 377039 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/ccss.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/ccss.c?view=diff&rev=377040&r1=377039&r2=377040
==============================================================================
--- trunk/main/ccss.c (original)
+++ trunk/main/ccss.c Mon Dec  3 11:10:40 2012
@@ -4536,6 +4536,8 @@
 	ast_cc_monitor_unregister(&generic_monitor_cbs);
 	ast_unregister_application(cccancel_app);
 	ast_unregister_application(ccreq_app);
+	ast_logger_unregister_level(CC_LOGGER_LEVEL_NAME);
+	ast_cli_unregister_multiple(cc_cli, ARRAY_LEN(cc_cli));
 
 	if (cc_sched_context) {
 		ast_sched_context_destroy(cc_sched_context);