[svn-commits] oej: branch oej/lapsang-queue-shared-lastcall-1.4 r369921 - in /team/oej/laps...

[SVN commits to the Digium repositories]

Author: oej
Date: Wed Jul 11 07:41:44 2012
New Revision: 369921

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369921
Log:
Backporting stuff

Modified:
    team/oej/lapsang-queue-shared-lastcall-1.4/apps/app_queue.c
    team/oej/lapsang-queue-shared-lastcall-1.4/configs/queues.conf.sample

Modified: team/oej/lapsang-queue-shared-lastcall-1.4/apps/app_queue.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/lapsang-queue-shared-lastcall-1.4/apps/app_queue.c?view=diff&rev=369921&r1=369920&r2=369921
==============================================================================
--- team/oej/lapsang-queue-shared-lastcall-1.4/apps/app_queue.c (original)
+++ team/oej/lapsang-queue-shared-lastcall-1.4/apps/app_queue.c Wed Jul 11 07:41:44 2012
@@ -287,6 +287,9 @@
 /*! \brief queues.conf [general] option */
 static int montype_default = 0;
 
+/*! \brief queues.conf [general] option */
+static int shared_lastcall = 1;
+
 enum queue_result {
 	QUEUE_UNKNOWN = 0,
 	QUEUE_TIMEOUT = 1,
@@ -325,6 +328,7 @@
 	struct callattempt *q_next;
 	struct callattempt *call_next;
 	struct ast_channel *chan;
+	struct call_queue *lastqueue;
 	char interface[256];
 	int stillgoing;
 	int metric;
@@ -368,6 +372,7 @@
 	int status;                         /*!< Status of queue member */
 	int paused;                         /*!< Are we paused (not accepting calls)? */
 	time_t lastcall;                    /*!< When last successful call was hungup */
+	struct call_queue *lastqueue;       /*!< Last queue we received a call */
 	unsigned int dead:1;                /*!< Used to detect members deleted in realtime */
 	unsigned int delme:1;               /*!< Flag to delete entry on reload */
 };
@@ -1936,11 +1941,14 @@
 	const char *macrocontext, *macroexten;
 
 	/* on entry here, we know that tmp->chan == NULL */
-	if (qe->parent->wrapuptime && (time(NULL) - tmp->lastcall < qe->parent->wrapuptime)) {
+	if ((tmp->lastqueue && tmp->lastqueue->wrapuptime && (time(NULL) - tmp->lastcall < tmp->lastqueue->wrapuptime)) ||
+		(!tmp->lastqueue && qe->parent->wrapuptime && (time(NULL) - tmp->lastcall < qe->parent->wrapuptime))) {
 		if (option_debug)
-			ast_log(LOG_DEBUG, "Wrapuptime not yet expired for %s\n", tmp->interface);
-		if (qe->chan->cdr)
+			ast_log(LOG_DEBUG, "Wrapuptime not yet expired on queue %s for %s\n", 
+				(tmp->lastqueue ? tmp->lastqueue->name : qe->parent->name), tmp->interface);
+		if (qe->chan->cdr) {
 			ast_cdr_busy(qe->chan->cdr);
+		}
 		tmp->stillgoing = 0;
 		(*busies)++;
 		return 0;
@@ -2640,15 +2648,38 @@
 
 static int update_queue(struct call_queue *q, struct member *member, int callcompletedinsl)
 {
+	struct member *mem;
+	
+	if (shared_lastcall) {
+		AST_LIST_LOCK(&queues);
+		AST_LIST_TRAVERSE(&queues, q, list) {
+			ao2_lock(q);
+			if ((mem = ao2_find(q->members, member, OBJ_POINTER))) {
+				time(&mem->lastcall);
+				mem->calls++;
+				mem->lastqueue = q;
+				ao2_ref(mem, -1);
+			}
+			ao2_unlock(q);
+		}
+		AST_LIST_UNLOCK(&queues);
+	} else {
+		ao2_lock(q);
+		time(&member->lastcall);
+		member->calls++;
+		member->lastqueue = q;
+		ao2_unlock(q);
+	}	
 	ao2_lock(q);
-	time(&member->lastcall);
-	member->calls++;
 	q->callscompleted++;
-	if (callcompletedinsl)
+	if (callcompletedinsl) {
 		q->callscompletedinsl++;
+	}
+
 	ao2_unlock(q);
 	return 0;
 }
+
 
 /*! \brief Calculate the metric of each member in the outgoing callattempts
  *
@@ -3019,6 +3050,7 @@
 		tmp->member = cur;
 		tmp->oldstatus = cur->status;
 		tmp->lastcall = cur->lastcall;
+		tmp->lastqueue = cur->lastqueue;
 		ast_copy_string(tmp->interface, cur->interface, sizeof(tmp->interface));
 		/* Special case: If we ring everyone, go ahead and ring them, otherwise
 		   just calculate their metric for the appropriate strategy */
@@ -4522,6 +4554,10 @@
 		if (!strcasecmp(cat, "general")) {	
 			/* Initialize global settings */
 			queue_persistent_members = 0;
+			shared_lastcall = 0;
+			if ((general_val = ast_variable_retrieve(cfg, "general", "shared_lastcall"))) {
+				shared_lastcall = ast_true(general_val);
+			}
 			if ((general_val = ast_variable_retrieve(cfg, "general", "persistentmembers")))
 				queue_persistent_members = ast_true(general_val);
 			autofill_default = 0;

Modified: team/oej/lapsang-queue-shared-lastcall-1.4/configs/queues.conf.sample
URL: http://svnview.digium.com/svn/asterisk/team/oej/lapsang-queue-shared-lastcall-1.4/configs/queues.conf.sample?view=diff&rev=369921&r1=369920&r2=369921
==============================================================================
--- team/oej/lapsang-queue-shared-lastcall-1.4/configs/queues.conf.sample (original)
+++ team/oej/lapsang-queue-shared-lastcall-1.4/configs/queues.conf.sample Wed Jul 11 07:41:44 2012
@@ -108,6 +108,13 @@
 ; free member another call (default is 0, or no delay)
 ;
 ;wrapuptime=15
+;
+; shared_lastcall will make the lastcall and calls received be the same in
+; members logged in more than one queue.  This is useful to make the queue
+; respect the wrapuptime of another queue for a shared member.
+; The default value is yes.
+;
+;shared_lastcall=no
 ;
 ; Autofill will follow queue strategy but push multiple calls through
 ; at same time until there are no more waiting callers or no more