kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-23 16:59:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge "sounds_index: Avoid repeatedly reindexing." into 13

Browse Source
This commit is contained in:
Jenkins2
2017-12-07 12:43:44 -06:00
committed by Gerrit Code Review
parent 58addb1e38 db6602f6f7
commit 9bf73ae1b3
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/asterisk.c
+6 -1
View File
@@ -4701,9 +4701,14 @@ static void asterisk_daemon(int isroot, const char *runuser, const char *rungrou
check_init(init_manager(), "Asterisk Manager Interface");
check_init(ast_enum_init(), "ENUM Support");
check_init(ast_cc_init(), "Call Completion Supplementary Services");
check_init(ast_sounds_index_init(), "Sounds Indexer");
check_init(load_modules(0), "Module");
/*
* This is initialized after the dynamic modules load to avoid repeatedly
* reindexing sounds for every format module load.
*/
check_init(ast_sounds_index_init(), "Sounds Indexer");
/* loads the cli_permissoins.conf file needed to implement cli restrictions. */
ast_cli_perms_init(0);
main/sounds_index.c
+5 -4
View File
@@ -285,13 +285,15 @@ static void sounds_cleanup(void)
static void format_update_cb(void *data, struct stasis_subscription *sub,
struct stasis_message *message)
{
ast_sounds_reindex();
/* Reindexing during shutdown is pointless. */
if (!ast_shutting_down()) {
ast_sounds_reindex();
}
}
int ast_sounds_index_init(void)
{
int res = 0;
sounds_index = NULL;
if (ast_sounds_reindex()) {
return -1;
}
@@ -328,6 +330,5 @@ int ast_sounds_index_init(void)
struct ast_media_index *ast_sounds_get_index(void)
{
ao2_ref(sounds_index, +1);
return sounds_index;
return ao2_bump(sounds_index);
}