[svn-commits] russell: trunk r68284 - in /trunk: ./ apps/app_queue.c channels/chan_agent.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Jun  7 16:17:52 2007
New Revision: 68284

URL: http://svn.digium.com/view/asterisk?view=rev&rev=68284
Log:
Merged revisions 68280 via svnmerge from 
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)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_queue.c
    trunk/channels/chan_agent.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?view=diff&rev=68284&r1=68283&r2=68284
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Thu Jun  7 16:17:52 2007
@@ -239,7 +239,7 @@
 "Example: QueueLog(101|${UNIQUEID}|${AGENT}|WENTONBREAK|600)\n";
 
 /*! \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 */
 #define PM_MAX_LEN 8192
 
@@ -3111,10 +3111,14 @@
 				break;
 			ast_mutex_unlock(&cur_queue->lock);
 		}
+		
+		if (!cur_queue)
+			cur_queue = load_realtime_queue(queue_name);
 
 		if (!cur_queue) {
 			/* If the queue no longer exists, remove it from the
 			 * database */
+			ast_log(LOG_WARNING, "Error loading persistent queue: '%s': it does not exist\n", queue_name);
 			ast_db_del(pm_family, queue_name);
 			continue;
 		} else

Modified: trunk/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_agent.c?view=diff&rev=68284&r1=68283&r2=68284
==============================================================================
--- trunk/channels/chan_agent.c (original)
+++ trunk/channels/chan_agent.c Thu Jun  7 16:17:52 2007
@@ -134,7 +134,7 @@
 #define AST_MAX_BUF	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 */
 
 static int persistent_agents = 0;                   /*!< queues.conf [general] option */