Author: sayer
Date: 2009-02-14 13:35:24 +0100 (Sat, 14 Feb 2009)
New Revision: 1272
Modified:
trunk/apps/conference/Conference.cpp
trunk/core/AmSessionContainer.cpp
trunk/doc/Readme.monitoring
Log:
using local tag insteda of call id (can be used for controlling session by
sending events)
Modified: trunk/apps/conference/Conference.cpp
===================================================================
--- trunk/apps/conference/Conference.cpp 2009-02-12 21:23:17 UTC (rev
1271)
+++ trunk/apps/conference/Conference.cpp 2009-02-14 12:35:24 UTC (rev
1272)
@@ -500,7 +500,7 @@
setCallgroup(conf_id);
- MONITORING_LOG(getCallID().c_str(), "conf_id", conf_id.c_str());
+ MONITORING_LOG(getLocalTag().c_str(), "conf_id", conf_id.c_str());
if(dialedout || !allow_dialout) {
DBG("Dialout not enabled or dialout channel. Disabling DTMF detection.\n");
Modified: trunk/core/AmSessionContainer.cpp
===================================================================
--- trunk/core/AmSessionContainer.cpp 2009-02-12 21:23:17 UTC (rev 1271)
+++ trunk/core/AmSessionContainer.cpp 2009-02-14 12:35:24 UTC (rev 1272)
@@ -88,7 +88,7 @@
if(cur_session->is_stopped() && cur_session->detached.get()){
- MONITORING_MARK_FINISHED(cur_session->getCallID().c_str());
+ MONITORING_MARK_FINISHED(cur_session->getLocalTag().c_str());
DBG("session %p has been destroyed'\n",(void*)cur_session->_pid);
delete cur_session;
@@ -204,7 +204,7 @@
return NULL;
}
- MONITORING_LOG5(session->getCallID().c_str(),
+ MONITORING_LOG5(session->getLocalTag().c_str(),
"app", req.cmd.c_str(),
"dir", "out",
"from", req.from.c_str(),
@@ -219,7 +219,7 @@
session->getCallID(),
session->getRemoteTag());
delete session;
- MONITORING_MARK_FINISHED(session->getCallID().c_str());
+ MONITORING_MARK_FINISHED(session->getLocalTag().c_str());
return NULL;
}
@@ -272,7 +272,7 @@
throw string("internal server error");
}
- MONITORING_LOG5(req.callid.c_str(),
+ MONITORING_LOG5(local_tag.c_str(),
"app", req.cmd.c_str(),
"dir", "in",
"from", req.from.c_str(),
Modified: trunk/doc/Readme.monitoring
===================================================================
--- trunk/doc/Readme.monitoring 2009-02-12 21:23:17 UTC (rev 1271)
+++ trunk/doc/Readme.monitoring 2009-02-14 12:35:24 UTC (rev 1272)
@@ -7,9 +7,9 @@
monitoring information is explicitely pushed to monitoring module via
DI calls (See ampi/MonitoringAPI.h for useful macros). Info is always
-accessed via primary key, usually call-id. Info for every call is organized
-as attribute-value pairs (one or more values), value can be any type
-representable by AmArg (SEMS' variant type).
+accessed via primary key, usually the session's local tag. Info for
+every call is organized as attribute-value pairs (one or more values),
+value can be any type representable by AmArg (SEMS' variant type).
A call can be marked as finished. If not done before, this is done by
the session container when deleting a session (i.e., as the session
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
