[asterisk-scf-commits] asterisk-scf/examples.git branch "master" updated.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Wed Jan 11 10:56:32 CST 2012
branch "master" has been updated
via 8efb67d1b389ebdfef1245ed8977dc9d0558fab5 (commit)
via 2a67f2b1f76fb1e7390c5a0890b695e26f80d11d (commit)
from d5234495dcefc121ea0f9027b9cf3c7ad3a2e156 (commit)
Summary of changes:
configs/BridgeManager.conf | 2 +-
configs/Logger.conf | 2 +-
configs/MediaOperationCoreStateReplicator.conf | 2 +-
configs/MediaServiceRTP.conf | 2 +-
configs/MediaServiceRTPStateReplicator.conf | 2 +-
configs/RoutingStateReplicator.conf | 2 +-
configs/ServiceDiscovery.conf | 2 +-
configs/SipService.conf | 2 +-
configs/SipStateReplicator.conf | 2 +-
configs/start_astscf.sh | 3 ++-
10 files changed, 11 insertions(+), 10 deletions(-)
- Log -----------------------------------------------------------------
commit 8efb67d1b389ebdfef1245ed8977dc9d0558fab5
Author: Darren Sessions <dsessions at digium.com>
Date: Wed Jan 11 10:56:17 2012 -0600
Modified the example startup script so that it starts the bridge manager before the routing service so the routing service doesn't immediately start generating noise about not being able to find the bridge manager. Added a half second delay in the start_component function within the example start script to prevent components from not being able to find the service locator when they startup (speficially, this was needed on the AA65s which consistantly have this issue).
diff --git a/configs/start_astscf.sh b/configs/start_astscf.sh
index 34c5bb3..b45b558 100755
--- a/configs/start_astscf.sh
+++ b/configs/start_astscf.sh
@@ -9,8 +9,8 @@ components[i++]=Logger
components[i++]=MediaFormatGeneric
components[i++]=MediaOperationsCore
components[i++]=MediaServiceRTP
-components[i++]=RoutingService
components[i++]=BridgeManager
+components[i++]=RoutingService
components[i++]=SipService
function usage()
@@ -33,6 +33,7 @@ function start_component()
# 1 - component and config file name (friendly)
echo "Starting ${1}"
${ICE_HOME}/bin/icebox --Ice.Config=${1}.conf &>>logs/${1}.log &
+ sleep .5
}
while test $# -gt 0; do
commit 2a67f2b1f76fb1e7390c5a0890b695e26f80d11d
Author: Darren Sessions <dsessions at digium.com>
Date: Wed Jan 11 10:43:41 2012 -0600
Updated the entry point specification label in several of the example IceBox config files to reflect the new Asterisk SCF library names.
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index 9c816fe..a5fa508 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
# this value was empirically determined... it may need to be different on different systems
Ice.Default.CollocationOptimized=0
Ice.ThreadPool.Client.Size=10
-IceBox.Service.BridgeManager=bridgeservice:create
+IceBox.Service.BridgeManager=BridgeService:create
BridgeManager.ServiceAdapter.Endpoints=tcp -p 4441
BridgeManager.BackplaneAdapter.Endpoints=tcp -p 4442
diff --git a/configs/Logger.conf b/configs/Logger.conf
index ca9e773..8ef18a4 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -1,6 +1,6 @@
IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
-IceBox.Service.Logger=logging-service:createLoggingService
+IceBox.Service.Logger=LoggingService:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index eb0718d..4bf5de6 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.MediaOperationsCoreReplicator=MediaOperationStateReplicator:create
+IceBox.Service.MediaOperationsCoreReplicator=MediaOperationsCoreReplicator:create
MediaOperationsCoreReplicator.Adapter.ThreadPool.Size=4
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index d4d6021..47a3c12 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.MediaServiceRTP=media_rtp_pjmedia:create
+IceBox.Service.MediaServiceRTP=MediaRTPPJMEDIA:create
MediaServiceRTP.ServiceAdapter.Endpoints=tcp -p 4471
MediaServiceRTP.BackplaneAdapter.Endpoints=tcp -p 4472
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index 2937471..a6b5160 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.RtpStateReplicator=RtpStateReplicator:create
+IceBox.Service.RtpStateReplicator=RTPStateReplicator:create
RtpStateReplicator.Adapter.ThreadPool.Size=4
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index fc35ccd..8084b2f 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.RoutingStateReplicator=RoutingStateReplicator:create
+IceBox.Service.RoutingStateReplicator=BasicRoutingStateReplicator:create
RoutingStateReplicator.Adapter.ThreadPool.Size=4
diff --git a/configs/ServiceDiscovery.conf b/configs/ServiceDiscovery.conf
index 0792580..8f5303a 100644
--- a/configs/ServiceDiscovery.conf
+++ b/configs/ServiceDiscovery.conf
@@ -1,6 +1,6 @@
IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
-IceBox.Service.ServiceDiscovery=service_locator:create
+IceBox.Service.ServiceDiscovery=ServiceLocator:create
ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
diff --git a/configs/SipService.conf b/configs/SipService.conf
index b6f727e..f9654a0 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SipService=SipSessionManager:create
+IceBox.Service.SipService=SIPSessionManager:create
SipService.ServiceAdapter.Endpoints=tcp -p 4461
SipService.ServiceAdapter.ThreadPool.Size=4
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 94d974c..f0f0dda 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -2,7 +2,7 @@ IceBox.InheritProperties=1
Ice.Default.CollocationOptimized=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
-IceBox.Service.SipStateReplicator=SipStateReplicator:create
+IceBox.Service.SipStateReplicator=SIPStateReplicator:create
SipStateReplicator.Adapter.ThreadPool.Size=4
-----------------------------------------------------------------------
--
asterisk-scf/examples.git
More information about the asterisk-scf-commits
mailing list