ARI: Don't complain about missing ARI users when we aren't enabled

Currently, if ARI is not enabled it will still complain that there are no
configured users.  This patch checks to see if ARI is enabled before logging and
error or iterating the container to validate the users.

Review: https://reviewboard.asterisk.org/r/3391/
........

Merged revisions 411173 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@411174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
changes/97/197/1
Sean Bright 11 years ago
parent 2bf37a417d
commit c32fe8b8e5

@ -290,12 +290,14 @@ static int process_config(int reload)
return -1;
}
if (ao2_container_count(conf->users) == 0) {
ast_log(LOG_ERROR, "No configured users for ARI\n");
if (conf->general->enabled) {
if (ao2_container_count(conf->users) == 0) {
ast_log(LOG_ERROR, "No configured users for ARI\n");
} else {
ao2_callback(conf->users, OBJ_NODATA, validate_user_cb, NULL);
}
}
ao2_callback(conf->users, OBJ_NODATA, validate_user_cb, NULL);
return 0;
}

Loading…
Cancel
Save