[asterisk-commits] mmichelson: branch group/manager2 r110276 - /team/group/manager2/apps/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Thu Mar 20 13:16:46 2008
New Revision: 110276

URL: http://svn.digium.com/view/asterisk?view=rev&rev=110276
Log:
Remove most of the commented manager events. Still don't have the manager events taken care of
where the channel variables are appended


Modified:
    team/group/manager2/apps/app_queue.c

Modified: team/group/manager2/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/manager2/apps/app_queue.c?view=diff&rev=110276&r1=110275&r2=110276
==============================================================================
--- team/group/manager2/apps/app_queue.c (original)
+++ team/group/manager2/apps/app_queue.c Thu Mar 20 13:16:46 2008
@@ -719,20 +719,7 @@
 						AST_EVENT_IE_INFO_QUEUE_PAUSED, AST_EVENT_IE_PLTYPE_UINT, cur->paused,
 						AST_EVENT_IE_END);
 				ast_event_queue(event);
-/*
-				manager_event(EVENT_FLAG_AGENT, "QueueMemberStatus",
-					"Queue: %s\r\n"
-					"Location: %s\r\n"
-					"MemberName: %s\r\n"
-					"Membership: %s\r\n"
-					"Penalty: %d\r\n"
-					"CallsTaken: %d\r\n"
-					"LastCall: %d\r\n"
-					"Status: %d\r\n"
-					"Paused: %d\r\n",
-					q->name, cur->interface, cur->membername, cur->dynamic ? "dynamic" : cur->realtime ? "realtime" : "static",
-					cur->penalty, cur->calls, (int)cur->lastcall, cur->status, cur->paused);
-*/
+
 			}
 			ao2_ref(cur, -1);
 		}
@@ -1761,15 +1748,7 @@
 				AST_EVENT_IE_END);
 
 		ast_event_queue(event);
-#if 0
-		manager_event(EVENT_FLAG_CALL, "Join",
-			"Channel: %s\r\nCallerID: %s\r\nCallerIDName: %s\r\nQueue: %s\r\nPosition: %d\r\nCount: %d\r\nUniqueid: %s\r\n",
-			qe->chan->name,
-			S_OR(qe->chan->cid.cid_num, "unknown"), /* XXX somewhere else it is <unknown> */
-			S_OR(qe->chan->cid.cid_name, "unknown"),
-			q->name, qe->pos, q->count, qe->chan->uniqueid );
-#endif
-			ast_debug(1, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
+		ast_debug(1, "Queue '%s' Join, Channel '%s', Position '%d'\n", q->name, qe->chan->name, qe->pos );
 	}
 	ao2_unlock(q);
 	ao2_unlock(queues);
@@ -1987,12 +1966,6 @@
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
-#if 0
-			/* Take us out of the queue */
-			manager_event(EVENT_FLAG_CALL, "Leave",
-				"Channel: %s\r\nQueue: %s\r\nCount: %d\r\nUniqueid: %s\r\n",
-				qe->chan->name, q->name,  q->count, qe->chan->uniqueid);
-#endif
 			ast_debug(1, "Queue '%s' Leave, Channel '%s'\n", q->name, qe->chan->name );
 			/* Take us out of the queue */
 			if (prev)
@@ -2470,15 +2443,6 @@
 
 	ast_event_queue(event);
 
-#if 0
-	manager_event(EVENT_FLAG_AGENT, "QueueCallerAbandon",
-		"Queue: %s\r\n"
-		"Uniqueid: %s\r\n"
-		"Position: %d\r\n"
-		"OriginalPosition: %d\r\n"
-		"HoldTime: %d\r\n",
-		qe->parent->name, qe->chan->uniqueid, qe->pos, qe->opos, (int)(time(NULL) - qe->start));
-#endif
 	qe->parent->callsabandoned++;
 	ao2_unlock(qe->parent);
 }
@@ -3897,14 +3861,6 @@
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
-
-#if 0
-			manager_event(EVENT_FLAG_AGENT, "QueueMemberRemoved",
-				"Queue: %s\r\n"
-				"Location: %s\r\n"
-				"MemberName: %s\r\n",
-				q->name, mem->interface, mem->membername);
-#endif
 			ao2_unlink(q->members, mem);
 			remove_from_interfaces(mem->state_interface);
 			ao2_ref(mem, -1);
@@ -3961,22 +3917,6 @@
 					AST_EVENT_IE_END);
 
 			ast_event_queue(event);
-#if 0
-			manager_event(EVENT_FLAG_AGENT, "QueueMemberAdded",
-				"Queue: %s\r\n"
-				"Location: %s\r\n"
-				"MemberName: %s\r\n"
-				"Membership: %s\r\n"
-				"Penalty: %d\r\n"
-				"CallsTaken: %d\r\n"
-				"LastCall: %d\r\n"
-				"Status: %d\r\n"
-				"Paused: %d\r\n",
-				q->name, new_member->interface, new_member->membername,
-				"dynamic",
-				new_member->penalty, new_member->calls, (int) new_member->lastcall,
-				new_member->status, new_member->paused);
-#endif		
 			ao2_ref(new_member, -1);
 			new_member = NULL;
 
@@ -4039,16 +3979,6 @@
 							AST_EVENT_IE_END);
 
 					ast_event_queue(event);
-#if 0
-					manager_event(EVENT_FLAG_AGENT, "QueueMemberPaused",
-						"Queue: %s\r\n"
-						"Location: %s\r\n"
-						"MemberName: %s\r\n"
-						"Paused: %d\r\n"
-						"Reason: %s\r\n",
-						q->name, mem->interface, mem->membername, paused, reason);
-#endif
-
 				} else {
 					event = ast_event_new(AST_EVENT_QUEUE_MEMBER_PAUSED,
 							AST_EVENT_IE_INFO_QUEUE_NAME, AST_EVENT_IE_PLTYPE_STR, q->name,
@@ -4058,14 +3988,6 @@
 							AST_EVENT_IE_END);
 
 					ast_event_queue(event);
-#if 0
-					manager_event(EVENT_FLAG_AGENT, "QueueMemberPaused",
-						"Queue: %s\r\n"
-						"Location: %s\r\n"
-						"MemberName: %s\r\n"
-						"Paused: %d\r\n",
-						q->name, mem->interface, mem->membername, paused);
-#endif 
 				}
 				ao2_ref(mem, -1);
 			}
@@ -4108,13 +4030,6 @@
 						AST_EVENT_IE_END);
 
 				ast_event_queue(event);
-#if 0
-				manager_event(EVENT_FLAG_AGENT, "QueueMemberPenalty",
-					"Queue: %s\r\n"
-					"Location: %s\r\n"
-					"Penalty: %d\r\n",
-					q->name, mem->interface, penalty);
-#endif
 			}
 		}
 		ao2_unlock(q);