Cleanup taskprocessor on exit.
authorRichard Mudgett <rmudgett@digium.com>
Tue, 11 Dec 2012 20:46:23 +0000 (20:46 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 11 Dec 2012 20:46:23 +0000 (20:46 +0000)
* Cleanup CLI commands on exit.

(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
      taskprocessor-cleanup-1_8-11-trunk.patch (license #5909) patch uploaded by Corey Farrell
      taskprocessor-cleanup-10-only.patch (license #5909) patch uploaded by Corey Farrell
      Modified
........

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

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@377841 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/taskprocessor.c

index 912f891..d8f1af3 100644 (file)
@@ -122,10 +122,15 @@ static struct ast_cli_entry taskprocessor_clis[] = {
        AST_CLI_DEFINE(cli_tps_report, "List instantiated task processors and statistics"),
 };
 
-/*! \internal \brief Clean up resources on Asterisk shutdown */
+/*!
+ * \internal
+ * \brief Clean up resources on Asterisk shutdown
+ */
 static void tps_shutdown(void)
 {
+       ast_cli_unregister_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
        ao2_t_ref(tps_singletons, -1, "Unref tps_singletons in shutdown");
+       tps_singletons = NULL;
 }
 
 /* initialize the taskprocessor container and register CLI operations */