diff options
| author | Automerge script <automerge@asterisk.org> | 2012-12-03 20:19:34 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-12-03 20:19:34 +0000 |
| commit | aea70ddc83df9b6542df1b87c43f17c7917200dc (patch) | |
| tree | 973f345ff0c768e5f3144d640da9da406475657b /main | |
| parent | 1ba058bb7d1eac129e95921b8600b5127e011055 (diff) | |
Merged revisions 377107 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r377107 | rmudgett | 2012-12-03 13:33:06 -0600 (Mon, 03 Dec 2012) | 16 lines
Cleanup config cache on exit.
(issue ASTERISK-20649)
Reported by: Corey Farrell
Patches:
config-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
........
Merged revisions 377104 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 377105 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377106 from http://svn.asterisk.org/svn/asterisk/branches/11
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main')
| -rw-r--r-- | main/config.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/main/config.c b/main/config.c index bf9196316..f56421ee0 100644 --- a/main/config.c +++ b/main/config.c @@ -3131,9 +3131,23 @@ static struct ast_cli_entry cli_config[] = { AST_CLI_DEFINE(handle_cli_config_list, "Show all files that have loaded a configuration file"), }; +static void config_shutdown(void) +{ + struct cache_file_mtime *cfmtime; + + AST_LIST_LOCK(&cfmtime_head); + while ((cfmtime = AST_LIST_REMOVE_HEAD(&cfmtime_head, list))) { + ast_free(cfmtime); + } + AST_LIST_UNLOCK(&cfmtime_head); + + ast_cli_unregister_multiple(cli_config, ARRAY_LEN(cli_config)); +} + int register_config_cli(void) { ast_cli_register_multiple(cli_config, ARRAY_LEN(cli_config)); + ast_register_atexit(config_shutdown); return 0; } |