kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

database takes precedence over memcache 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@12999 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Rupa Schomaker 2009-04-11 06:37:45 +00:00
parent 077ccaae2d
commit db261c7a0a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/mod/applications/mod_cidlookup/mod_cidlookup.c
View File

@ -392,18 +392,21 @@ static char *do_lookup(switch_memory_pool_t *pool, switch_event_t *event, const
number = string_digitsonly(pool, num);
switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "caller_id_number", number);
if (globals.cache) {
name = check_cache(pool, number);
}
#ifdef SWITCH_HAVE_ODBC
if (!name && globals.master_odbc && globals.sql) {
/* database always wins */
if (globals.master_odbc && globals.sql) {
name = do_db_lookup(pool, event, number);
}
#endif
if (!skipurl && !name && globals.url) {
name = do_lookup_url(pool, event, number);
if (globals.cache && name) {
set_cache(pool, number, name);
if (!name && globals.url) {
if (globals.cache) {
name = check_cache(pool, number);
}
if (!skipurl && !name) {
name = do_lookup_url(pool, event, number);
if (globals.cache && name) {
set_cache(pool, number, name);
}
}
}
return name;