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

FS-8377 Fix the handling of hiredis limit release when using an interval. The expectation for interval is to NOT decrement the limit.

This commit is contained in:
William King 2015-11-04 15:14:50 -08:00
parent 238722879b
commit a6cbe9034d
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,7 +142,7 @@ SWITCH_LIMIT_INCR(hiredis_limit_incr)
} }
if ( interval ) { if ( interval ) {
limit_key = switch_mprintf("%s_%d", resource, now % interval); limit_key = switch_mprintf("%s_%d", resource, now / interval);
} else { } else {
limit_key = switch_mprintf("%s", resource); limit_key = switch_mprintf("%s", resource);
} }
@ -163,6 +163,7 @@ SWITCH_LIMIT_INCR(hiredis_limit_incr)
limit_pvt->resource = switch_core_strdup(session_pool, resource); limit_pvt->resource = switch_core_strdup(session_pool, resource);
limit_pvt->limit_key = switch_core_strdup(session_pool, limit_key); limit_pvt->limit_key = switch_core_strdup(session_pool, limit_key);
limit_pvt->inc = 1; limit_pvt->inc = 1;
limit_pvt->interval = interval;
switch_channel_set_private(channel, "hiredis_limit_pvt", limit_pvt); switch_channel_set_private(channel, "hiredis_limit_pvt", limit_pvt);
count = atoll(response); count = atoll(response);
@ -184,30 +185,21 @@ SWITCH_LIMIT_INCR(hiredis_limit_incr)
SWITCH_LIMIT_RELEASE(hiredis_limit_release) SWITCH_LIMIT_RELEASE(hiredis_limit_release)
{ {
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
hiredis_profile_t *profile = switch_core_hash_find(mod_hiredis_globals.profiles, realm); hiredis_profile_t *profile = NULL;
char *hashkey = NULL, *response = NULL; char *hashkey = NULL, *response = NULL;
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
hiredis_limit_pvt_t *limit_pvt = switch_channel_get_private(channel, "hiredis_limit_pvt"); hiredis_limit_pvt_t *limit_pvt = switch_channel_get_private(channel, "hiredis_limit_pvt");
if ( !zstr(realm) ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hiredis: realm must be defined\n");
switch_goto_status(SWITCH_STATUS_GENERR, done);
}
if ( !profile ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hiredis: Unable to locate profile[%s]\n", realm);
switch_goto_status(SWITCH_STATUS_GENERR, done);
}
/* If realm and resource are NULL, then clear all of the limits */ /* If realm and resource are NULL, then clear all of the limits */
if ( !realm && !resource ) { if ( !realm && !resource ) {
hiredis_limit_pvt_t *tmp = limit_pvt; hiredis_limit_pvt_t *tmp = limit_pvt;
while (tmp) { while (tmp) {
profile = switch_core_hash_find(mod_hiredis_globals.profiles, limit_pvt->realm);
hashkey = switch_mprintf("decr %s", tmp->limit_key); hashkey = switch_mprintf("decr %s", tmp->limit_key);
limit_pvt = tmp->next; limit_pvt = tmp->next;
if ( hiredis_profile_execute_sync(profile, hashkey, &response) != SWITCH_STATUS_SUCCESS) { if ( limit_pvt && (limit_pvt->interval > 0) && (hiredis_profile_execute_sync(profile, hashkey, &response) != SWITCH_STATUS_SUCCESS)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hiredis: profile[%s] error executing [%s] because [%s]\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "hiredis: profile[%s] error executing [%s] because [%s]\n",
tmp->realm, hashkey, response); tmp->realm, hashkey, response);
} }
@ -217,6 +209,7 @@ SWITCH_LIMIT_RELEASE(hiredis_limit_release)
switch_safe_free(hashkey); switch_safe_free(hashkey);
} }
} else { } else {
profile = switch_core_hash_find(mod_hiredis_globals.profiles, limit_pvt->realm);
hashkey = switch_mprintf("decr %s", limit_pvt->limit_key); hashkey = switch_mprintf("decr %s", limit_pvt->limit_key);

1
src/mod/applications/mod_hiredis/mod_hiredis.h
View File

@ -37,6 +37,7 @@ typedef struct hiredis_limit_pvt_s {
char *resource; char *resource;
char *limit_key; char *limit_key;
int inc; int inc;
int interval;
struct hiredis_limit_pvt_s *next; struct hiredis_limit_pvt_s *next;
} hiredis_limit_pvt_t; } hiredis_limit_pvt_t;