[asterisk-scf-commits] asterisk-scf/release/bridging.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Mon Sep 19 20:54:12 CDT 2011
branch "master" has been updated
via 2791d5926944131ea67ddd03ea9011632d47803a (commit)
via c43e634f98fd7daaabbf30877763b005f914b2b9 (commit)
from 843fe4b41b446f7f42361bfb9fbf2ff0e1143a66 (commit)
Summary of changes:
config/bridging.conf | 6 +-
config/test_bridging.conf | 119 ++++++++-----------------------
src/BridgeImpl.cpp | 44 ++++++------
src/BridgeManagerImpl.cpp | 42 ++++++------
src/BridgeManagerListenerMgr.h | 1 +
src/BridgeReplicatorService.cpp | 7 +-
src/BridgeReplicatorStateListenerI.cpp | 2 +-
src/Component.cpp | 7 +-
src/MediaSplicer.cpp | 22 +++---
src/SessionCollection.cpp | 2 +-
src/SessionListener.cpp | 4 +-
src/SessionWrapper.cpp | 28 ++++----
src/Tasks.h | 16 ++--
test/TestBridging.cpp | 1 -
14 files changed, 124 insertions(+), 177 deletions(-)
- Log -----------------------------------------------------------------
commit 2791d5926944131ea67ddd03ea9011632d47803a
Author: Brent Eagles <beagles at digium.com>
Date: Mon Sep 19 23:22:54 2011 -0230
- Update properties to be consistent with current guidelines.
- Fix a couple of issues with the test suite that were caused by recent changes.
- Started using "Trace" log level to cut down in default verbosity of test output.
diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index 0e78a47..35eced0 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -22,93 +22,31 @@ IceBox.InheritProperties=1
#
Ice.ThreadPool.Client.Size=4
-
-################################################################################
-# The following configuration is required for the the Service Locator component
-# because it loads a collocated instance of IceStorm.
-#
-#
-# We register services with names to help identify them within an IceBox instance.
-# It also helps with identifying properties in a configuration file as each
-# property that is specific to this service will be prefixed with
-# AsteriskSCFIceStorm.
-#
-
-#
-# Configure the IceStorm TopicManager's object adapter.
-#
ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
ServiceDiscovery.IceStorm.TopicManager.ThreadPool.Size=4
ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
-
-#
-# Configure the IceStorm publisher object adapter.
-#
ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
ServiceDiscovery.IceStorm.Publish.ThreadPool.Size=4
-
-#
-# This IceStorm instance will not need to persist subscriber/publisher
-# information across process lifetimes.
-#
ServiceDiscovery.IceStorm.Transient=1
-
-#
-# Control TopicManager tracing.
-#
-# 0 = no tracing
-# 1 = trace topic creation, subscription, unsubscription
-# 2 = like 1, but with more detailed subscription information
-#
ServiceDiscovery.IceStorm.Trace.TopicManager=0
-
-#
-# Flush interval in case any any subscribers have subscribed
-# using a batched oneway proxy. (Default is currently 1000ms)
-#
ServiceDiscovery.IceStorm.Flush.Timeout=2000
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
-#
-# Finally the proxy that can be used to access this IceStorm instance.
-#
-TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 10000
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4422
+
+LocatorService.Proxy=LocatorService:tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
-#
-# Logger service configuration. Proxies to the logger service
-# are obtained through the service locator so specifying a port
-# number is not required.
-#
LoggerAdapter.Endpoints=default
+Logger.ServiceAdapter.Endpoints=default
AsteriskSCF.LoggingService.Endpoints=default
AsteriskSCF.LoggingService.ThreadPool.Size=4
AsteriskSCF.LoggingClient.Endpoints=default
AsteriskSCF.LoggingClient.ThreadPool.Size=4
-#
-# Service Locator configuration. Usually the service locator
-# and it`s collocated IceStorm instance are the only services
-# that need to have their ports specified. The service locator
-# instantiates two adapters:
-# * The ServiceLocatorAdapter which hosts the servants that implement
-# the lookup queries for clients wishing to obtain proxies to services.
-# * The ServiceLocatorManagerAdapter which hosts the servants for the
-# objects that implement the registration management for services
-#
-TestServiceLocator.Management.ServiceAdapter.Endpoints=tcp -p 4412
-TestServiceLocator.Locator.ServiceAdapter.Endpoints=tcp -p 4412
-TestServiceLocator.Locator.ServiceAdapter.ThreadPool.Size=4
-
-ServiceLocatorAdapter.ThreadPool.Size=4
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
-ServiceLocatorManagementAdapter.ThreadPool.Size=4
-
-
-#
-# The proxies that clients use to access the Service Locator facilities.
-#
-LocatorService.Proxy=LocatorService:default -p 4411
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
#
# The IceBox entries for loading the services.
@@ -117,7 +55,7 @@ IceBox.Service.Logger=logging-service:createLoggingService
IceBox.Service.Replicator=BridgeReplicator:create
IceBox.Service.TestBridge=bridgeservice:create
IceBox.Service.TestBridge2=bridgeservice:create
-IceBox.Service.TestServiceLocator=service_locator:create
+IceBox.Service.ServiceDiscovery=service_locator:create
IceBox.Service.TestChannel=test_channel:create
IceBox.Service.TestDriver=bridge_component_test:create
@@ -137,15 +75,20 @@ TestChannel.InstanceName=BridgeTest
# explicitly set.
#
TestBridge.InstanceName=TestBridge
-TestBridge.ManagerId=TestBridgeManager
-# TestBridge.Endpoints=default -p 57000
-# TestBridge.Backplane.Endpoints=default -p 57001
+TestBridge.BridgeManagerObjectId=TestBridgeManager
+TestBridge.ServiceAdapter.Endpoints=default -p 57000
+TestBridge.ServiceAdapter.ThreadPool.Size=4
+TestBridge.BackplaneAdapter.Endpoints=default -p 57001
+TestBridge.BackplaneAdapter.ThreadPool.Size=4
+TestBridge.Standby=false
TestBridge2.InstanceName=TestBridge2
-TestBridge2.ManagerId=TestBridgeManager2
-TestBridge2.Standby=yes
-TestBridge2.Endpoints=default -p 57010
-TestBridge2.Backplane.Endpoints=default -p 57011
+TestBridge2.BridgeManagerObjectId=TestBridgeManager2
+TestBridge2.Standby=false
+TestBridge2.ServiceAdapter.Endpoints=default -p 57010
+TestBridge2.ServiceAdapter.ThreadPool.Size=4
+TestBridge2.BackplaneAdapter.Endpoints=default -p 57011
+TestBridge2.BackplaneAdapter.ThreadPool.Size=4
#
# Configuration for the bridge state replicator.
@@ -162,7 +105,7 @@ Replicator.InstanceName=Replicator
# Multiple services are loaded in the single IceBox instance. It is necessary to have
# them start in a specific order so dependencies are available when they are needed.
#
-IceBox.LoadOrder=TestServiceLocator Logger Replicator TestBridge TestBridge2 TestChannel TestDriver
+IceBox.LoadOrder=ServiceDiscovery Logger Replicator TestBridge TestBridge2 TestChannel TestDriver
#
# Configuring a manager endpoint for the IceBox service allows services to be managed and
diff --git a/src/BridgeImpl.cpp b/src/BridgeImpl.cpp
index 1563ec9..5f85479 100755
--- a/src/BridgeImpl.cpp
+++ b/src/BridgeImpl.cpp
@@ -710,7 +710,7 @@ BridgeImpl::BridgeImpl(const string& name, const Ice::ObjectAdapterPtr& adapter,
mSessionListener(createSessionListener(mSessions, logger)),
mLogger(logger)
{
- mLogger(Debug) << FUNLOG << ": creating a new Bridge with " << listeners.size() << " default listeners";
+ mLogger(Trace) << FUNLOG << ": creating a new Bridge with " << listeners.size() << " default listeners";
for (vector<BridgeListenerPrx>::const_iterator i = listeners.begin();
i != listeners.end(); ++i)
{
@@ -743,7 +743,7 @@ void BridgeImpl::addSessions_async(const AMD_Bridge_addSessionsPtr& callback, co
}
checkSessions(sessions);
statePreCheck();
- mLogger(Debug) << FUNLOG << ": adding " << sessions.size() << " sessions";
+ mLogger(Trace) << FUNLOG << ": adding " << sessions.size() << " sessions";
SessionsTrackerPtr tracker(new SessionsTracker);
QueuedTasks tasks;
@@ -828,7 +828,7 @@ void BridgeImpl::removeSessions_async(const AMD_Bridge_removeSessionsPtr& callba
SessionSeq BridgeImpl::listSessions(const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
statePreCheck();
return mSessions->getSessionSeq();
}
@@ -845,19 +845,19 @@ void BridgeImpl::shutdown(const Ice::Current& current)
// When shutting down, the bridge makes a copy of its current state and unlocks, proceeding with
// no other internal locks.
//
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
BridgeStateItemPtr update;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mState->runningState == ShuttingDown)
{
- mLogger(Debug) << FUNLOG << ": called when shutting down." ;
+ mLogger(Trace) << FUNLOG << ": called when shutting down." ;
return;
}
if (mState->runningState == Destroyed)
{
- mLogger(Debug) << FUNLOG << ": called when destroyed." ;
+ mLogger(Trace) << FUNLOG << ": called when destroyed." ;
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
}
mState->runningState = ShuttingDown;
@@ -892,18 +892,18 @@ void BridgeImpl::shutdown(const Ice::Current& current)
void BridgeImpl::destroy(const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
BridgeStateItemPtr update;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mState->runningState == ShuttingDown)
{
- mLogger(Debug) << FUNLOG << ": called when shutting down." ;
+ mLogger(Trace) << FUNLOG << ": called when shutting down." ;
throw AsteriskSCF::System::Component::V1::ShuttingDown();
}
if (mState->runningState == Destroyed)
{
- mLogger(Debug) << FUNLOG << ": called when destroyed." ;
+ mLogger(Trace) << FUNLOG << ": called when destroyed." ;
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
}
mState->runningState = Destroyed;
@@ -922,7 +922,7 @@ void BridgeImpl::destroy(const Ice::Current& current)
void BridgeImpl::addListener(const BridgeListenerPrx& listener, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current) << " with bridge listener: " <<
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current) << " with bridge listener: " <<
(listener ? "(nil)" : mObjAdapter->getCommunicator()->identityToString(listener->ice_getIdentity()));
if (!listener)
{
@@ -945,7 +945,7 @@ void BridgeImpl::addListener(const BridgeListenerPrx& listener, const Ice::Curre
void BridgeImpl::removeListener(const BridgeListenerPrx& listener, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current) << " with bridge listener: " <<
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current) << " with bridge listener: " <<
(listener ? "(nil)" : mObjAdapter->getCommunicator()->identityToString(listener->ice_getIdentity()));
if (!listener)
{
@@ -979,7 +979,7 @@ void BridgeImpl::replaceSession_async(const AMD_Bridge_replaceSessionPtr& callba
{
try
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
mSessions->reap();
checkSessions(newSessions);
statePreCheck();
@@ -1036,7 +1036,7 @@ void BridgeImpl::replaceSession_async(const AMD_Bridge_replaceSessionPtr& callba
void BridgeImpl::setCookies(const BridgeCookies& cookies, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
BridgeStateItemPtr update;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
@@ -1057,7 +1057,7 @@ void BridgeImpl::setCookies(const BridgeCookies& cookies, const Ice::Current& cu
void BridgeImpl::removeCookies(const BridgeCookies& cookies, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
BridgeStateItemPtr update;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
@@ -1083,7 +1083,7 @@ void BridgeImpl::removeCookies(const BridgeCookies& cookies, const Ice::Current&
BridgeCookies BridgeImpl::getCookies(const BridgeCookies& cookies, const Ice::Current& current)
{
BridgeCookies result;
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::shared_lock<boost::shared_mutex> lock(mLock);
for (BridgeCookies::const_iterator i = cookies.begin(); i != cookies.end(); ++i)
{
@@ -1099,7 +1099,7 @@ BridgeCookies BridgeImpl::getCookies(const BridgeCookies& cookies, const Ice::Cu
bool BridgeImpl::destroyed()
{
boost::shared_lock<boost::shared_mutex> lock(mLock);
- mLogger(Debug) << FUNLOG << ": " << (mState->runningState == Destroyed ? "yes, I am destroyed." : "no, I am not destroyed") ;
+ mLogger(Trace) << FUNLOG << ": " << (mState->runningState == Destroyed ? "yes, I am destroyed." : "no, I am not destroyed") ;
return (mState->runningState == Destroyed);
}
@@ -1143,7 +1143,7 @@ void BridgeImpl::activate(const BridgePrx& proxy)
{
mPrx = proxy;
string listenerId = mObjAdapter->getCommunicator()->identityToString(mPrx->ice_getIdentity());
- mLogger(Debug) << FUNLOG << " : activating with " << listenerId;
+ mLogger(Trace) << FUNLOG << " : activating with " << listenerId;
mState->key = listenerId;
mState->bridgeId = listenerId;
listenerId += ".sessionListener";
@@ -1169,7 +1169,7 @@ void BridgeImpl::activate(const BridgePrx& proxy)
void BridgeImpl::updateState(const BridgeStateItemPtr& state)
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::unique_lock<boost::shared_mutex> lock(mLock);
//
// We perform a deep copy because there are no guarantees about the thread safety of the memory
@@ -1191,7 +1191,7 @@ void BridgeImpl::removeListener(const BridgeListenerStateItemPtr& update)
void BridgeImpl::activate()
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::unique_lock<boost::shared_mutex> lock(mLock);
mActivated = true;
mPrx = BridgePrx::uncheckedCast(mObjAdapter->add(this, mObjAdapter->getCommunicator()->stringToIdentity(mState->key)));
@@ -1241,12 +1241,12 @@ void BridgeImpl::statePreCheck()
if (mState->runningState == ShuttingDown)
{
- mLogger(Debug) << FUNLOG << ": called when shutting down." ;
+ mLogger(Trace) << FUNLOG << ": called when shutting down." ;
throw AsteriskSCF::System::Component::V1::ShuttingDown();
}
if (mState->runningState == Destroyed)
{
- mLogger(Debug) << FUNLOG << ": called when destroyed." ;
+ mLogger(Trace) << FUNLOG << ": called when destroyed." ;
throw Ice::ObjectNotExistException(__FILE__, __LINE__);
}
}
@@ -1322,7 +1322,7 @@ AsteriskSCF::BridgeService::BridgeServant::create(const Ice::ObjectAdapterPtr& o
const Logger& logger,
const AsteriskSCF::Replication::BridgeService::V1::BridgeStateItemPtr& state)
{
- logger(Debug) << FUNLOG << ": creating replica for " << state->bridgeId;
+ logger(Trace) << FUNLOG << ": creating replica for " << state->bridgeId;
IceUtil::Handle<AsteriskSCF::BridgeService::BridgeServant> bridge(
new BridgeImpl(state->bridgeId, objectAdapter, vector<BridgeListenerPrx>(),
listenerMgr, replicator, state, logger));
diff --git a/src/BridgeManagerImpl.cpp b/src/BridgeManagerImpl.cpp
index 7361dc5..04089a2 100644
--- a/src/BridgeManagerImpl.cpp
+++ b/src/BridgeManagerImpl.cpp
@@ -174,7 +174,7 @@ void BridgeManagerImpl::createBridge_async(const AMD_BridgeManager_createBridgeP
{
try
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
statePreCheck(BOOST_CURRENT_FUNCTION);
reap();
@@ -221,7 +221,7 @@ void BridgeManagerImpl::createBridge_async(const AMD_BridgeManager_createBridgeP
void BridgeManagerImpl::addListener(const BridgeManagerListenerPrx& listener, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
statePreCheck(BOOST_CURRENT_FUNCTION);
if (!mListeners)
@@ -235,7 +235,7 @@ void BridgeManagerImpl::addListener(const BridgeManagerListenerPrx& listener, co
void BridgeManagerImpl::removeListener(const BridgeManagerListenerPrx& listener, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
statePreCheck(BOOST_CURRENT_FUNCTION);
if (!mListeners)
@@ -250,7 +250,7 @@ void BridgeManagerImpl::removeListener(const BridgeManagerListenerPrx& listener,
void BridgeManagerImpl::addDefaultBridgeListener(const BridgeListenerPrx& newListener,
const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
if (!newListener)
{
mLogger(Info) << current.adapter->getCommunicator()->identityToString(current.id) << " attempting to add a null proxy";
@@ -261,7 +261,7 @@ void BridgeManagerImpl::addDefaultBridgeListener(const BridgeListenerPrx& newLis
if (mState->defaultBridgeListeners.end() == find_if(mState->defaultBridgeListeners.begin(), mState->defaultBridgeListeners.end(),
IdentityComparePredicate<BridgeListenerPrx>(newListener)))
{
- mLogger(Debug) << FUNLOG << ": adding new listener " << current.adapter->getCommunicator()->identityToString(newListener->ice_getIdentity());
+ mLogger(Trace) << FUNLOG << ": adding new listener " << current.adapter->getCommunicator()->identityToString(newListener->ice_getIdentity());
mState->defaultBridgeListeners.push_back(newListener);
}
update();
@@ -269,7 +269,7 @@ void BridgeManagerImpl::addDefaultBridgeListener(const BridgeListenerPrx& newLis
void BridgeManagerImpl::removeDefaultBridgeListener(const BridgeListenerPrx& toRemove, const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
if (!toRemove)
{
mLogger(Info) << current.adapter->getCommunicator()->identityToString(current.id)
@@ -285,7 +285,7 @@ void BridgeManagerImpl::removeDefaultBridgeListener(const BridgeListenerPrx& toR
BridgeSeq BridgeManagerImpl::listBridges(const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
reap();
BridgeSeq result;
@@ -298,16 +298,16 @@ BridgeSeq BridgeManagerImpl::listBridges(const Ice::Current& current)
void BridgeManagerImpl::shutdown(const Ice::Current& current)
{
- mLogger(Debug) << FUNLOG << ":" << objectIdFromCurrent(current);
+ mLogger(Trace) << FUNLOG << ":" << objectIdFromCurrent(current);
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::ShuttingDown)
{
- mLogger(Debug) << FUNLOG << ": already shutting down.";
+ mLogger(Trace) << FUNLOG << ": already shutting down.";
return;
}
if (mState->runningState == Paused || mListeners->isSuspended())
{
- mLogger(Debug) << FUNLOG << ": called when suspended." ;
+ mLogger(Trace) << FUNLOG << ": called when suspended." ;
throw AsteriskSCF::System::Component::V1::Suspended();
}
if (mListeners && !mListeners->isSuspended())
@@ -332,13 +332,13 @@ void BridgeManagerImpl::shutdown(const Ice::Current& current)
bool BridgeManagerImpl::destroyed()
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
return mState->runningState == AsteriskSCF::Replication::BridgeService::V1::Destroyed;
}
BridgeManagerStateItemPtr BridgeManagerImpl::getState()
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
//
// Copy it instead of passing a reference for thread safety.
//
@@ -349,7 +349,7 @@ BridgeManagerStateItemPtr BridgeManagerImpl::getState()
void BridgeManagerImpl::updateState(const BridgeManagerStateItemPtr& state)
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::unique_lock<boost::shared_mutex> lock(mLock);
//
// We perform a deep copy because there are no guarantees about the thread safety of the memory
@@ -361,7 +361,7 @@ void BridgeManagerImpl::updateState(const BridgeManagerStateItemPtr& state)
vector<BridgeServantPtr> BridgeManagerImpl::getBridges()
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::shared_lock<boost::shared_mutex> lock(mLock);
vector<BridgeServantPtr> result;
for (vector<BridgeInfo>::iterator i = mBridges.begin(); i != mBridges.end(); ++i)
@@ -382,7 +382,7 @@ void BridgeManagerImpl::activate()
void BridgeManagerImpl::createBridgeReplica(const BridgeStateItemPtr& state)
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::unique_lock<boost::shared_mutex> lock(mLock);
Ice::Identity id(mAdapter->getCommunicator()->stringToIdentity(state->bridgeId));
BridgePrx prx(BridgePrx::uncheckedCast(mAdapter->createProxy(id)));
@@ -400,7 +400,7 @@ void BridgeManagerImpl::createBridgeReplica(const BridgeStateItemPtr& state)
void BridgeManagerImpl::removeBridge(const BridgeStateItemPtr& state)
{
- mLogger(Debug) << FUNLOG;
+ mLogger(Trace) << FUNLOG;
boost::unique_lock<boost::shared_mutex> lock(mLock);
for (vector<BridgeInfo>::iterator i = mBridges.begin(); i != mBridges.end(); ++i)
{
@@ -411,12 +411,12 @@ void BridgeManagerImpl::removeBridge(const BridgeStateItemPtr& state)
break;
}
}
- mLogger(Debug) << FUNLOG << ": reaping completed, bridge set size is now " << mBridges.size() << "." ;
+ mLogger(Trace) << FUNLOG << ": reaping completed, bridge set size is now " << mBridges.size() << "." ;
}
void BridgeManagerImpl::reap()
{
- mLogger(Debug) << FUNLOG << ": reaping bridge set of " << mBridges.size() << " bridges." ;
+ mLogger(Trace) << FUNLOG << ": reaping bridge set of " << mBridges.size() << " bridges." ;
vector<BridgeInfo>::iterator i = mBridges.begin();
while (i != mBridges.end())
{
@@ -429,7 +429,7 @@ void BridgeManagerImpl::reap()
}
++i;
}
- mLogger(Debug) << FUNLOG << ": reaping completed, bridge set size is now " << mBridges.size() << "." ;
+ mLogger(Trace) << FUNLOG << ": reaping completed, bridge set size is now " << mBridges.size() << "." ;
}
void BridgeManagerImpl::statePreCheck(const string& caller)
@@ -440,12 +440,12 @@ void BridgeManagerImpl::statePreCheck(const string& caller)
}
if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::ShuttingDown)
{
- mLogger(Debug) << caller << ": called when shutting down." ;
+ mLogger(Trace) << caller << ": called when shutting down." ;
throw AsteriskSCF::System::Component::V1::ShuttingDown();
}
if (mState->runningState == AsteriskSCF::Replication::BridgeService::V1::Paused || mListeners->isSuspended())
{
- mLogger(Debug) << caller << ": called when suspended." ;
+ mLogger(Trace) << caller << ": called when suspended." ;
throw AsteriskSCF::System::Component::V1::Suspended();
}
}
diff --git a/src/BridgeManagerListenerMgr.h b/src/BridgeManagerListenerMgr.h
index 2678420..4cb4555 100644
--- a/src/BridgeManagerListenerMgr.h
+++ b/src/BridgeManagerListenerMgr.h
@@ -40,5 +40,6 @@ private:
};
typedef IceUtil::Handle<BridgeManagerListenerMgr> BridgeManagerListenerMgrPtr;
+
} // End of namespace BridgeService
} // End of namespace AsteriskSCF
diff --git a/src/BridgeReplicatorStateListenerI.cpp b/src/BridgeReplicatorStateListenerI.cpp
index d260135..4e32e2b 100644
--- a/src/BridgeReplicatorStateListenerI.cpp
+++ b/src/BridgeReplicatorStateListenerI.cpp
@@ -116,7 +116,7 @@ public:
{
for (ReplicatedStateItemSeq::const_iterator i = items.begin(); i != items.end(); ++i)
{
- mLogger(Debug) << " received update " << (*i)->serial << " for " << (*i)->key << " (a " <<
+ mLogger(Trace) << " received update " << (*i)->serial << " for " << (*i)->key << " (a " <<
(*i)->ice_id() << ")";
map<string, ReplicatedStateItemPtr>::iterator entry = mItems.find((*i)->key);
ReplicatedStateItemPtr existingItem;
diff --git a/src/MediaSplicer.cpp b/src/MediaSplicer.cpp
index 2cde267..8022a66 100755
--- a/src/MediaSplicer.cpp
+++ b/src/MediaSplicer.cpp
@@ -102,7 +102,7 @@ public:
mReplicator(replicator),
mLogger(logger)
{
- mLogger(Debug) << FUNLOG << ": setting up a media connector with " << mOutgoing.size()
+ mLogger(Trace) << FUNLOG << ": setting up a media connector with " << mOutgoing.size()
<< " outgoing pairings and " << mIncoming.size() << " incoming pairings.";
mKey = mBridgeId + mSessionId + "media";
}
@@ -132,9 +132,9 @@ public:
void unplug()
{
- mLogger(Debug) << FUNLOG << ": called.";
+ mLogger(Trace) << FUNLOG << ": called.";
disconnectMedia();
- mLogger(Debug) << FUNLOG << ": finished unplugging.";
+ mLogger(Trace) << FUNLOG << ": finished unplugging.";
if (mReplicator)
{
try
@@ -145,7 +145,7 @@ public:
}
catch (const std::exception& ex)
{
- mLogger(Debug) << FUNLOG << ": exception " << ex.what();
+ mLogger(Trace) << FUNLOG << ": exception " << ex.what();
}
}
}
@@ -158,7 +158,7 @@ public:
void clearConnections()
{
- mLogger(Debug) << FUNLOG << ": clearing connections.";
+ mLogger(Trace) << FUNLOG << ": clearing connections.";
boost::unique_lock<boost::shared_mutex> lock(mLock);
mOutgoing.clear();
mIncoming.clear();
@@ -167,7 +167,7 @@ public:
void update(const MediaConnectorPtr& peer, const OutgoingPairings& outgoing,
const IncomingPairings& incoming, const std::map<std::string, std::string>& newConnections)
{
- mLogger(Debug) << FUNLOG << ": establishing a new peer connection.";
+ mLogger(Trace) << FUNLOG << ": establishing a new peer connection.";
SessionPairingPtr currentState;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
@@ -243,7 +243,7 @@ public:
newState = createUpdate();
}
pushUpdate(newState);
- mLogger(Debug) << FUNLOG << ": unplugging sinks and sources";
+ mLogger(Trace) << FUNLOG << ": unplugging sinks and sources";
//
// NOTE: we used to talk to the peer and disconnect it too, but really
@@ -299,7 +299,7 @@ public:
bool disconnectMedia()
{
- mLogger(Debug) << FUNLOG << ": unplugging sinks and sources.";
+ mLogger(Trace) << FUNLOG << ": unplugging sinks and sources.";
SessionPairingPtr newState;
vector<OutgoingPairing> outgoing;
vector<IncomingPairing> incoming;
@@ -313,7 +313,7 @@ public:
newState = createUpdate();
}
pushUpdate(newState);
- mLogger(Debug) << FUNLOG << ": unplugging sinks and sources";
+ mLogger(Trace) << FUNLOG << ": unplugging sinks and sources";
//
// NOTE: we used to talk to the peer and disconnect it too, but really
@@ -437,7 +437,7 @@ public:
{
if (!(*i)->isConnected())
{
- mLogger(Debug) << FUNLOG << ": reaping a connector";
+ mLogger(Trace) << FUNLOG << ": reaping a connector";
i = mConnectors.erase(i);
continue;
}
@@ -474,7 +474,7 @@ public:
{
if (!(*i)->isConnected())
{
- mLogger(Debug) << FUNLOG << ": reaping a connector";
+ mLogger(Trace) << FUNLOG << ": reaping a connector";
MediaConnectors::iterator t = i;
i = mConnectors.erase(t);
continue;
diff --git a/src/SessionCollection.cpp b/src/SessionCollection.cpp
index eb15ad9..7d06ef6 100644
--- a/src/SessionCollection.cpp
+++ b/src/SessionCollection.cpp
@@ -120,7 +120,7 @@ SessionSeq SessionCollection::getSessionSeq()
selectIf(active);
visitSessions(selectIf);
SessionSeq results(selectIf.results());
- mLogger(Debug) << FUNLOG << " " << results.size();
+ mLogger(Trace) << FUNLOG << " " << results.size();
return results;
}
diff --git a/src/SessionListener.cpp b/src/SessionListener.cpp
index 34d825f..9062ca6 100644
--- a/src/SessionListener.cpp
+++ b/src/SessionListener.cpp
@@ -217,9 +217,9 @@ public:
mBridgePrx->shutdown();
}
}
- catch (const Ice::Exception&)
+ catch (const Ice::Exception& ex)
{
- mLogger(Error) << "Unexpected exception when initiating auto shutdown";
+ mLogger(Error) << "Unexpected exception when initiating auto shutdown: " << ex.what();
}
}
}
diff --git a/src/SessionWrapper.cpp b/src/SessionWrapper.cpp
index 1178f5e..f70ee87 100644
--- a/src/SessionWrapper.cpp
+++ b/src/SessionWrapper.cpp
@@ -55,7 +55,7 @@ public:
//
// There isn't rally anything to do on success.
//
- mLogger(Debug) << "connect call on " << mSession->id() << " succeeded.";
+ mLogger(Trace) << "connect call on " << mSession->id() << " succeeded.";
}
void failureCB(const Ice::Exception& ex)
@@ -405,7 +405,7 @@ void SessionWrapper::connect()
{
if (setConnected())
{
- mLogger(Debug) << FUNLOG << " sending ConnectIndication() to " << mId;
+ mLogger(Trace) << FUNLOG << " sending ConnectIndication() to " << mId;
//
// A word about expected context. In a conference bridge, it is quite possible that multiple sessions will have
// connect() called on them "at once". By using AMI to send these requests out, we free the
@@ -435,7 +435,7 @@ void SessionWrapper::ring()
bool SessionWrapper::setConnected()
{
- mLogger(Debug) << FUNLOG << " for " << mId;
+ mLogger(Trace) << FUNLOG << " for " << mId;
bool makingConnected = false;
BridgedSessionPtr stateUpdate;
{
@@ -448,7 +448,7 @@ bool SessionWrapper::setConnected()
}
else
{
- mLogger(Debug) << FUNLOG << " skipped setting connected state, unexpected state " << mSession->currentState;
+ mLogger(Trace) << FUNLOG << " skipped setting connected state, unexpected state " << mSession->currentState;
}
}
pushUpdate(stateUpdate);
@@ -482,7 +482,7 @@ void SessionWrapper::setSessionController(const AsteriskSCF::SessionCommunicatio
void SessionWrapper::setupMedia()
{
- mLogger(Debug) << FUNLOG << " for " << mId;
+ mLogger(Trace) << FUNLOG << " for " << mId;
boost::unique_lock<boost::shared_mutex> lock(mLock);
//
// TODO: we don't really want there to be any precondition checks in this
@@ -495,7 +495,7 @@ void SessionWrapper::setupMedia()
void SessionWrapper::setConnector(const MediaConnectorPtr& connector)
{
- mLogger(Debug) << FUNLOG << " for " << mId;
+ mLogger(Trace) << FUNLOG << " for " << mId;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
mConnector = connector;
@@ -504,7 +504,7 @@ void SessionWrapper::setConnector(const MediaConnectorPtr& connector)
void SessionWrapper::updateMedia(const SessionPairingPtr& pairings)
{
- mLogger(Debug) << FUNLOG << " for " << mId;
+ mLogger(Trace) << FUNLOG << " for " << mId;
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mConnector)
{
@@ -518,7 +518,7 @@ void SessionWrapper::updateMedia(const SessionPairingPtr& pairings)
void SessionWrapper::disconnect()
{
- mLogger(Debug) << FUNLOG << ": disconnecting " << mId;
+ mLogger(Trace) << FUNLOG << ": disconnecting " << mId;
BridgedSessionPtr stateUpdate;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
@@ -535,7 +535,7 @@ void SessionWrapper::disconnect()
void SessionWrapper::update(const BridgedSessionPtr& newState)
{
- mLogger(Debug) << FUNLOG << ": for " << mId;
+ mLogger(Trace) << FUNLOG << ": for " << mId;
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (mSession->serial < newState->serial || newState->serial < SerialCounterStart)
{
@@ -550,7 +550,7 @@ void SessionWrapper::update(const BridgedSessionPtr& newState)
void SessionWrapper::destroy()
{
- mLogger(Debug) << FUNLOG << ": for " << mId;
+ mLogger(Trace) << FUNLOG << ": for " << mId;
BridgedSessionPtr newState;
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
@@ -591,13 +591,13 @@ std::map<std::string, std::string> SessionWrapper::connections()
void SessionWrapper::setup()
{
- mLogger(Debug) << FUNLOG << ": starting setup of connected session " << mId;
+ mLogger(Trace) << FUNLOG << ": starting setup of connected session " << mId;
mActivities->append(new QueueableExecutor(createSetupTasks(this), mLogger));
}
void SessionWrapper::shutdown(const SessionListenerPrx& listener, const ResponseCodePtr& code)
{
- mLogger(Debug) << FUNLOG << ": beginning shutdown of " << mId;
+ mLogger(Trace) << FUNLOG << ": beginning shutdown of " << mId;
QueuedTaskPtr shutdownRunner(new QueueableExecutor(createShutdownTasks(this, listener, code, mLogger), mLogger));
if (!code)
{
@@ -616,7 +616,7 @@ void SessionWrapper::shutdown(const SessionListenerPrx& listener, const Response
AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState SessionWrapper::setState(const AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState newState)
{
- mLogger(Debug) << FUNLOG << ": updating state " << mId;
+ mLogger(Trace) << FUNLOG << ": updating state " << mId;
BridgedSessionPtr copyOfNewState;
AsteriskSCF::Replication::BridgeService::V1::BridgedSessionState oldState;
{
@@ -639,7 +639,7 @@ void SessionWrapper::unplugMedia()
}
catch (const Ice::Exception& ex)
{
- mLogger(Debug) << FUNLOG << ": " << ex.what();
+ mLogger(Trace) << FUNLOG << ": " << ex.what();
}
}
}
diff --git a/src/Tasks.h b/src/Tasks.h
index c3ce557..226a584 100644
--- a/src/Tasks.h
+++ b/src/Tasks.h
@@ -235,7 +235,7 @@ public:
**/
void start()
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " starting running.";
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " starting running.";
{
boost::unique_lock<boost::shared_mutex> lock(mLock);
if (!mStopped)
@@ -258,7 +258,7 @@ public:
**/
void stop()
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " setting stop";
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " setting stop";
boost::unique_lock<boost::shared_mutex> lock(mLock);
mStopped = true;
}
@@ -286,7 +286,7 @@ public:
QueuedTaskPtr current = popNextTask();
while (current)
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " executing " << current->name();
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " executing " << current->name();
//
// Properly implemented tasks will return true if the next task should
@@ -313,11 +313,11 @@ public:
**/
void failed()
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " entering failed state";
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " entering failed state";
QueuedTaskPtr current = popNextTask();
while (current)
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " failing " << current->name();
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " failing " << current->name();
current->fail();
current = popNextTask();
}
@@ -334,14 +334,14 @@ public:
**/
void destroy()
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " entering destroyed state";
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " entering destroyed state";
//
// NOTE: a request that is in progress will not be destroyed.
//
QueuedTaskPtr current = popNextTask();
while (current)
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " destroying " << current->name();
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " destroying " << current->name();
current->destroy();
current = popNextTask();
}
@@ -367,7 +367,7 @@ public:
**/
void append(const QueuedTaskPtr& newTask)
{
- mLogger(AsteriskSCF::System::Logging::Debug) << " " << mName << " Appending new task " << newTask->name();
+ mLogger(AsteriskSCF::System::Logging::Trace) << " " << mName << " Appending new task " << newTask->name();
bool restart = false;
{
newTask->setListener(this);
diff --git a/test/TestBridging.cpp b/test/TestBridging.cpp
index f58155f..088e85f 100644
--- a/test/TestBridging.cpp
+++ b/test/TestBridging.cpp
@@ -959,7 +959,6 @@ public:
ReplicaPrx secondaryReplica = env()->secondaryReplicaControl();
ReplicaPrx primaryReplica = env()->primaryReplicaControl();
BOOST_CHECK(primaryReplica->isActive() == true);
- BOOST_CHECK(secondaryReplica->isActive() == false);
primaryReplica->standby();
BOOST_CHECK(primaryReplica->isActive() == false);
commit c43e634f98fd7daaabbf30877763b005f914b2b9
Author: Brent Eagles <beagles at digium.com>
Date: Mon Sep 19 20:31:50 2011 -0230
Property name changes
diff --git a/config/bridging.conf b/config/bridging.conf
index dfc42d5..11591b3 100644
--- a/config/bridging.conf
+++ b/config/bridging.conf
@@ -2,15 +2,17 @@
Ice.Warn.UnknownProperties=0
# Adapter parameters for this component
-BridgeManager.BridgeService.Endpoints=default
+BridgeManager.Adapter.Endpoints=default
Ice.ThreadPool.Client.Size=4
# A proxy to the service locator management service
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
LocatorService.Proxy=LocatorService:tcp -p 4411
+#
# A proxy to the IceStorm topic manager
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+#
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
IceBox.InheritProperties=1
IceBox.Service.BridgeManager=bridgeservice:create
diff --git a/config/test_bridging.conf b/config/test_bridging.conf
index c8cb3c8..0e78a47 100644
--- a/config/test_bridging.conf
+++ b/config/test_bridging.conf
@@ -8,9 +8,7 @@
# that might have trouble due to AMI/AMD usage.
#
Ice.Default.CollocationOptimized=0
-
Ice.Override.Timeout=5000
-
Ice.Warn.UnknownProperties=0
#
@@ -35,26 +33,25 @@ Ice.ThreadPool.Client.Size=4
# property that is specific to this service will be prefixed with
# AsteriskSCFIceStorm.
#
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-
#
# Configure the IceStorm TopicManager's object adapter.
#
-AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 10000
-AsteriskSCFIceStorm.TopicManager.ThreadPool.Size=4
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
+ServiceDiscovery.IceStorm.TopicManager.ThreadPool.Size=4
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
#
# Configure the IceStorm publisher object adapter.
#
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
-AsteriskSCFIceStorm.Publish.ThreadPool.Size=4
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
+ServiceDiscovery.IceStorm.Publish.ThreadPool.Size=4
#
# This IceStorm instance will not need to persist subscriber/publisher
# information across process lifetimes.
#
-AsteriskSCFIceStorm.Transient=1
+ServiceDiscovery.IceStorm.Transient=1
#
# Control TopicManager tracing.
@@ -63,18 +60,18 @@ AsteriskSCFIceStorm.Transient=1
# 1 = trace topic creation, subscription, unsubscription
# 2 = like 1, but with more detailed subscription information
#
-AsteriskSCFIceStorm.Trace.TopicManager=0
+ServiceDiscovery.IceStorm.Trace.TopicManager=0
#
# Flush interval in case any any subscribers have subscribed
# using a batched oneway proxy. (Default is currently 1000ms)
#
-AsteriskSCFIceStorm.Flush.Timeout=2000
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
#
# Finally the proxy that can be used to access this IceStorm instance.
#
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 10000
#
# Logger service configuration. Proxies to the logger service
@@ -98,11 +95,14 @@ AsteriskSCF.LoggingClient.ThreadPool.Size=4
# * The ServiceLocatorManagerAdapter which hosts the servants for the
# objects that implement the registration management for services
#
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
+TestServiceLocator.Management.ServiceAdapter.Endpoints=tcp -p 4412
+TestServiceLocator.Locator.ServiceAdapter.Endpoints=tcp -p 4412
+TestServiceLocator.Locator.ServiceAdapter.ThreadPool.Size=4
+
ServiceLocatorAdapter.ThreadPool.Size=4
ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
ServiceLocatorManagementAdapter.ThreadPool.Size=4
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
+
#
# The proxies that clients use to access the Service Locator facilities.
diff --git a/src/BridgeReplicatorService.cpp b/src/BridgeReplicatorService.cpp
index 748dbcd..7ee758c 100644
--- a/src/BridgeReplicatorService.cpp
+++ b/src/BridgeReplicatorService.cpp
@@ -82,11 +82,11 @@ void BridgeReplicatorApp::start(const string& name, const Ice::CommunicatorPtr&
string adapterName;
if(name.size() == 0)
{
- adapterName = "BridgeReplicator";
+ adapterName = "Adapter";
}
else
{
- adapterName = name + ".BridgeReplicator";
+ adapterName = name + ".Adapter";
}
//
@@ -152,7 +152,8 @@ void BridgeReplicatorApp::start(const string& name, const Ice::CommunicatorPtr&
ServiceLocatorParamsPtr locatorParameters = new ServiceLocatorParams;
locatorParameters->category = StateReplicatorDiscoveryCategory;
locatorParameters->service = serviceName;
- locatorParameters->id = communicator->getProperties()->getPropertyWithDefault(name + ".ReplicatorName", "default");
+ locatorParameters->id = communicator->getProperties()->getPropertyWithDefault(name + ".StateReplicatorId",
+ "default");
mLocator = new LocatorRegistrationWrapper<ReplicatorPrx>(communicator, property, replicatorPrx, adapterName,
locatorParameters);
registered = mLocator->registerService();
diff --git a/src/Component.cpp b/src/Component.cpp
index 03b6484..41f7d7f 100644
--- a/src/Component.cpp
+++ b/src/Component.cpp
@@ -119,7 +119,8 @@ void Component::onPreInitialize()
void Component::createPrimaryServices()
{
std::string managerName =
- getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".ManagerId", "BridgeManager");
+ getCommunicator()->getProperties()->getPropertyWithDefault(getName() + ".BridgeManagerObjectId",
+ "BridgeManager");
//
// It's very important that uncheckedCast's be used here as there are no guarantees
@@ -207,8 +208,8 @@ void Component::findRemoteServices()
ServiceLocatorParamsPtr searchParams = new ServiceLocatorParams;
searchParams->category = StateReplicatorDiscoveryCategory;
searchParams->service = getCommunicator()->getProperties()->getPropertyWithDefault(
- "Bridge.StateReplicatorService", "default");
- searchParams->id = getCommunicator()->getProperties()->getProperty("Bridge.StateReplicatorId");
+ getName() + ".StateReplicatorService", "default");
+ searchParams->id = getCommunicator()->getProperties()->getProperty(getName() + ".StateReplicatorId");
try
{
-----------------------------------------------------------------------
--
asterisk-scf/release/bridging.git
More information about the asterisk-scf-commits
mailing list