kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 03:04:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 68280 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r68280 | russell | 2007-06-07 16:16:07 -0500 (Thu, 07 Jun 2007) | 4 lines

Fix loading persistent queue members when using realtime configuration for queues.
Also, remove an unneeded leading slash for the astdb family.
(issue #9911, patch by atis)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@68284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-06-07 21:17:52 +00:00
parent 4db176fdc2
commit e911f41166
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/app_queue.c
View File

@@ -239,7 +239,7 @@ static char *app_ql_descrip =
"Example: QueueLog(101|${UNIQUEID}|${AGENT}|WENTONBREAK|600)\n"; "Example: QueueLog(101|${UNIQUEID}|${AGENT}|WENTONBREAK|600)\n";
/*! \brief Persistent Members astdb family */ /*! \brief Persistent Members astdb family */
static const char *pm_family = "/Queue/PersistentMembers"; static const char *pm_family = "Queue/PersistentMembers";
/* The maximum length of each persistent member queue database entry */ /* The maximum length of each persistent member queue database entry */
#define PM_MAX_LEN 8192 #define PM_MAX_LEN 8192
@@ -3111,10 +3111,14 @@ static void reload_queue_members(void)
break; break;
ast_mutex_unlock(&cur_queue->lock); ast_mutex_unlock(&cur_queue->lock);
} }
if (!cur_queue)
cur_queue = load_realtime_queue(queue_name);
if (!cur_queue) { if (!cur_queue) {
/* If the queue no longer exists, remove it from the /* If the queue no longer exists, remove it from the
* database */ * database */
ast_log(LOG_WARNING, "Error loading persistent queue: '%s': it does not exist\n", queue_name);
ast_db_del(pm_family, queue_name); ast_db_del(pm_family, queue_name);
continue; continue;
} else } else

2
channels/chan_agent.c
View File

@@ -134,7 +134,7 @@ static char moh[80] = "default";
#define AST_MAX_BUF 256 #define AST_MAX_BUF 256
#define AST_MAX_FILENAME_LEN 256 #define AST_MAX_FILENAME_LEN 256
static const char pa_family[] = "/Agents"; /*!< Persistent Agents astdb family */ static const char pa_family[] = "Agents"; /*!< Persistent Agents astdb family */
#define PA_MAX_LEN 2048 /*!< The maximum length of each persistent member agent database entry */ #define PA_MAX_LEN 2048 /*!< The maximum length of each persistent member agent database entry */
static int persistent_agents = 0; /*!< queues.conf [general] option */ static int persistent_agents = 0; /*!< queues.conf [general] option */