kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 22:38:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "musiconhold: Only warn if music class is not found in memory and database."

Browse Source
This commit is contained in:
Joshua Colp
2016-03-25 05:52:05 -05:00
committed by Gerrit Code Review
parent 89e94e886c 13cdf3e8a1
commit 9462a08aee
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
res/res_musiconhold.c
View File

@@ -1379,6 +1379,18 @@ static struct mohclass *_moh_class_malloc(const char *file, int line, const char
return class; return class;
} }
static struct ast_variable *load_realtime_musiconhold(const char *name)
{
struct ast_variable *var = ast_load_realtime("musiconhold", "name", name, SENTINEL);
if (!var) {
ast_log(LOG_WARNING,
"Music on Hold class '%s' not found in memory/database. "
"Verify your configuration.\n",
name);
}
return var;
}
static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass) static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, const char *interpclass)
{ {
struct mohclass *mohclass = NULL; struct mohclass *mohclass = NULL;
@@ -1387,6 +1399,7 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
int res = 0; int res = 0;
int i; int i;
int realtime_possible = ast_check_realtime("musiconhold"); int realtime_possible = ast_check_realtime("musiconhold");
int warn_if_not_in_memory = !realtime_possible;
const char *classes[] = {NULL, NULL, interpclass, "default"}; const char *classes[] = {NULL, NULL, interpclass, "default"};
if (ast_test_flag(global_flags, MOH_PREFERCHANNELCLASS)) { if (ast_test_flag(global_flags, MOH_PREFERCHANNELCLASS)) {
@@ -1414,9 +1427,9 @@ static int local_ast_moh_start(struct ast_channel *chan, const char *mclass, con
for (i = 0; i < ARRAY_LEN(classes); ++i) { for (i = 0; i < ARRAY_LEN(classes); ++i) {
if (!ast_strlen_zero(classes[i])) { if (!ast_strlen_zero(classes[i])) {
mohclass = get_mohbyname(classes[i], 1, 0); mohclass = get_mohbyname(classes[i], warn_if_not_in_memory, 0);
if (!mohclass && realtime_possible) { if (!mohclass && realtime_possible) {
var = ast_load_realtime("musiconhold", "name", classes[i], SENTINEL); var = load_realtime_musiconhold(classes[i]);
} }
if (mohclass || var) { if (mohclass || var) {
break; break;