Merged revisions 377038 via svnmerge from

file:///srv/subversion/repos/asterisk/branches/10

................
  r377038 | rmudgett | 2012-12-03 11:06:44 -0600 (Mon, 03 Dec 2012) | 10 lines

  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
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@377068 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/ccss.c b/main/ccss.c
index 9c14fe1941159c73e633be6e371313dbc337bb7b..b7e8fcc1fa97eae8281128d38ff48ac66a2e4d73 100644 (file)
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -4491,6 +4491,8 @@ static void cc_shutdown(void)
        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);