[asterisk-scf-commits] asterisk-scf/integration/examples.git branch "retry_deux" created.
Commits to the Asterisk SCF project code repositories
asterisk-scf-commits at lists.digium.com
Thu Apr 12 11:51:18 CDT 2012
branch "retry_deux" has been created
at 3fa28c251339f421d8f3fd550d2fb088702af648 (commit)
- Log -----------------------------------------------------------------
commit 3fa28c251339f421d8f3fd550d2fb088702af648
Author: David M. Lee <dlee at digium.com>
Date: Thu Apr 12 10:51:31 2012 -0500
Don't trounce LD_LIBRARY_PATH
diff --git a/configs/start_astscf.sh b/configs/start_astscf.sh
index 5306005..cbbf806 100755
--- a/configs/start_astscf.sh
+++ b/configs/start_astscf.sh
@@ -25,7 +25,7 @@ echo "Using Asterisk SCF from ${ASTSCF_HOME:=/usr/local}"
mkdir -p logs
-export LD_LIBRARY_PATH=${ICE_HOME}/lib:${ICE_HOME}/lib64:${ASTSCF_HOME}/lib:${ASTSCF_HOME}/lib/asterisk-scf/icebox
+export LD_LIBRARY_PATH=${ICE_HOME}/lib:${ICE_HOME}/lib64:${ASTSCF_HOME}/lib:${ASTSCF_HOME}/lib/asterisk-scf/icebox:${LD_LIBRARY_PATH}
function start_component()
{
commit f5f61287e36cddf0cbf1e7b9543f4cfce129c003
Author: David M. Lee <dlee at digium.com>
Date: Thu Apr 12 10:51:14 2012 -0500
Fixed for bash 3
diff --git a/configs/start_astscf.sh b/configs/start_astscf.sh
index b45b558..5306005 100755
--- a/configs/start_astscf.sh
+++ b/configs/start_astscf.sh
@@ -32,7 +32,7 @@ function start_component()
# arguments:
# 1 - component and config file name (friendly)
echo "Starting ${1}"
- ${ICE_HOME}/bin/icebox --Ice.Config=${1}.conf &>>logs/${1}.log &
+ ${ICE_HOME}/bin/icebox --Ice.Config=${1}.conf >> logs/${1}.log 2>&1 &
sleep .5
}
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
commit d5234495dcefc121ea0f9027b9cf3c7ad3a2e156
Author: Joshua Colp <jcolp at digium.com>
Date: Wed Dec 28 17:48:49 2011 -0400
Use up to date property name for colocation optimization and also disable it in the bridge service.
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index 57c5257..9c816fe 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -1,5 +1,6 @@
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
diff --git a/configs/BridgeStateReplicator.conf b/configs/BridgeStateReplicator.conf
index 02a73aa..e9ab3e9 100644
--- a/configs/BridgeStateReplicator.conf
+++ b/configs/BridgeStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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.BridgeReplicator=BridgeReplicator:create
diff --git a/configs/Logger.conf b/configs/Logger.conf
index 2d25a25..ca9e773 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
IceBox.Service.Logger=logging-service:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
diff --git a/configs/MediaFormatGeneric.conf b/configs/MediaFormatGeneric.conf
index 220c004..9b097a9 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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.MediaFormatGeneric=mediaformatgeneric:create
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index de8ec45..eb0718d 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
diff --git a/configs/MediaOperationsCore.conf b/configs/MediaOperationsCore.conf
index c5ffa64..6064809 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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.MediaOperationsCore=MediaOperationsCore:create
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index df95a11..d4d6021 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index 626f0a8..2937471 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
diff --git a/configs/RoutingService.conf b/configs/RoutingService.conf
index 151f788..2d3330f 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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.RoutingService=BasicRoutingService:create
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index 8a09a9b..fc35ccd 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
diff --git a/configs/ServiceDiscovery.conf b/configs/ServiceDiscovery.conf
index b892382..0792580 100644
--- a/configs/ServiceDiscovery.conf
+++ b/configs/ServiceDiscovery.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+Ice.Default.CollocationOptimized=0
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index d4e86d9..7984ab9 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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.ServiceLocatorStateReplicator=ServiceLocatorStateReplicator:create
diff --git a/configs/SipService.conf b/configs/SipService.conf
index d58a678..b6f727e 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 2e0f42f..94d974c 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -1,5 +1,5 @@
IceBox.InheritProperties=1
-Ice.Default.CollocationOptimization=0
+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
commit ac2e185320ee115c8c4f94b907a47a499ffa6268
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Dec 22 13:01:17 2011 -0400
Update example configuration files to disable collocation optimization. It is incompatible due to our usage of AMI.
diff --git a/configs/BridgeStateReplicator.conf b/configs/BridgeStateReplicator.conf
index 9bf283a..02a73aa 100644
--- a/configs/BridgeStateReplicator.conf
+++ b/configs/BridgeStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.BridgeReplicator=BridgeReplicator:create
diff --git a/configs/Logger.conf b/configs/Logger.conf
index 76459b6..2d25a25 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
IceBox.Service.Logger=logging-service:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
diff --git a/configs/MediaFormatGeneric.conf b/configs/MediaFormatGeneric.conf
index c9e41d5..220c004 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaFormatGeneric=mediaformatgeneric:create
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index af3f963..de8ec45 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
diff --git a/configs/MediaOperationsCore.conf b/configs/MediaOperationsCore.conf
index 957da17..c5ffa64 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.MediaOperationsCore=MediaOperationsCore:create
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index 18124b1..df95a11 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index 12da59e..626f0a8 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
diff --git a/configs/RoutingService.conf b/configs/RoutingService.conf
index 41e6854..151f788 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.RoutingService=BasicRoutingService:create
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index 717ed84..8a09a9b 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
diff --git a/configs/ServiceDiscovery.conf b/configs/ServiceDiscovery.conf
index e06bef2..b892382 100644
--- a/configs/ServiceDiscovery.conf
+++ b/configs/ServiceDiscovery.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
IceBox.Service.ServiceDiscovery=service_locator:create
ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index 95c037f..d4e86d9 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=0
# this value was empirically determined... it may need to be different on different systems
Ice.ThreadPool.Client.Size=10
IceBox.Service.ServiceLocatorStateReplicator=ServiceLocatorStateReplicator:create
diff --git a/configs/SipService.conf b/configs/SipService.conf
index 8eb6a1a..d58a678 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 385a3b7..2e0f42f 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -1,4 +1,5 @@
IceBox.InheritProperties=1
+Ice.Default.CollocationOptimization=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
commit 76a0f175f5e75de7aa39bc25e2891ba03df620b3
Merge: b5ff593 d428e25
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Oct 6 11:05:10 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/examples
commit b5ff593fec8451cda48e75b42df01b89b1c8b71f
Author: Mark Michelson <mmichelson at digium.com>
Date: Thu Oct 6 11:04:50 2011 -0500
Add the respondToChallenge method for our sample auth hook.
diff --git a/ExampleSipAuthHook.py b/ExampleSipAuthHook.py
index 2154f52..bba8878 100755
--- a/ExampleSipAuthHook.py
+++ b/ExampleSipAuthHook.py
@@ -41,6 +41,19 @@ class ExampleAuthHook(AuthHook):
challenges = [ challenge ]
return (result, challenges)
+ def respondToChallenge(self, endpointName, realms, current=None):
+ result = HookResult()
+ result.status = HookStatus.Succeeded
+
+ auth = ClientAuth()
+ #Just grab the first realm from the list for this example
+ auth.realm = realms[0];
+ auth.username = "bob"
+ auth.password = "alice"
+
+ auths = [ auth ]
+
+ return (result, auths)
class ExampleAuthHookApp(Ice.Application):
def usage(self):
commit d428e252027ea3d406c08af5d125a2b5996040b0
Author: Joshua Colp <jcolp at digium.com>
Date: Thu Oct 6 12:30:01 2011 -0300
Fix mistake in example config.
diff --git a/configs/SipService.conf b/configs/SipService.conf
index b030461..8eb6a1a 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -14,7 +14,7 @@ SipService.Standalone=yes
SipService.ServiceName=default
# this property specifies which of the available service modules should
# be started in this instance
-SipService.Modules=Session Logging Registrar
+SipService.Sip.Modules=Session Logging Registrar
# These properties define the total timeout and delay
# per try in seconds for initialization of the
commit 12c24dc571f7063d7cafa87ce4850d51352ef626
Merge: bf8e37f a458518
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Sep 30 09:12:54 2011 -0500
Merge branch 'master' of git.asterisk.org:asterisk-scf/examples
commit bf8e37f7ec3d65c664913546b0eec8faaf58ed81
Author: Ken Hunt <ken.hunt at digium.com>
Date: Fri Sep 30 09:12:11 2011 -0500
Example party id hooks.
diff --git a/ExamplePartyIdHooks.py b/ExamplePartyIdHooks.py
new file mode 100644
index 0000000..6b84688
--- /dev/null
+++ b/ExamplePartyIdHooks.py
@@ -0,0 +1,188 @@
+#!/usr/bin/env python
+
+#
+# Asterisk SCF -- An open-source communications framework.
+#
+# Copyright (C) 2011, Digium, Inc.
+#
+# See http://www.asterisk.org for more information about
+# the Asterisk SCF project. Please do not directly contact
+# any of the maintainers of this project for assistance;
+# the project provides a web site, mailing lists and IRC
+# channels for your use.
+#
+# This program is free software, distributed under the terms of
+# the GNU General Public License Version 2. See the LICENSE.txt file
+# at the top of the source tree.
+#
+
+# Party Id sample hooks
+
+import sys, threading, Ice, os, getopt
+
+Ice.loadSlice("--underscore -I\"" + os.environ["ASTSCF_HOME"] + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + os.environ["ASTSCF_HOME"] + "/AsteriskSCF/Core/Discovery/ServiceLocatorIf.ice\"")
+Ice.loadSlice("--underscore -I\"" + os.environ["ASTSCF_HOME"] + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + os.environ["ASTSCF_HOME"] + "/AsteriskSCF/SessionCommunications/SessionCommunicationsExtensionPointsIf.ice\"")
+Ice.loadSlice("--underscore -I\"" + os.environ["ASTSCF_HOME"] + "\" -I\"" + Ice.getSliceDir() + "\" --all \"" + os.environ["ASTSCF_HOME"] + "/AsteriskSCF/SessionCommunications/PartyIdentificationIf.ice\"")
+
+
+from AsteriskSCF.Core.Discovery.V1 import *
+from AsteriskSCF.SessionCommunications.ExtensionPoints.V1 import *
+from AsteriskSCF.SessionCommunications.PartyIdentification.V1 import *
+from AsteriskSCF.System.Hook.V1 import *
+
+#
+# This hook is applied whenever a SessionController sends a ConnectedLine that is received by
+# the bridge's corresponding SessionController. The bridge caches the
+# ConnectedLine information for each session and this hook alters what gets cached
+# by the bridge for future use. So this is a handy place to do things like blocking
+# the ConnectedLine data altogether.
+#
+# The downside of this hook is that it is invoked when you don't know who the receiver
+# might eventually be.
+#
+class ExampleReceivedConnectedLineHook(ReceivedConnectedLinePartyIdHook):
+ def modifyReceivedConnectedLine(self, sendingSession, receivedConnectedLine, replacementConnectedLine):
+ result = HookResult()
+ result.status = HookStatus.Succeeded
+
+ # Foo-ify the party names.
+ ids = receivedConnectedLine.ids[:] # Copy the ids
+ for id in ids:
+ id.partyName = 'foo.' + id.partyName
+
+ replacementConnectedLine = AsteriskSCF.SessionCommunications.PartyIdentification.V1.ConnectedLine()
+ replacementConnectedLine = ids
+
+ return (result, replacementConnectedLine)
+
+#
+# This hook is applied when the bridge is about to send the ConnectedLine information to
+# members of the bridge other than the original sender. This hook can customize the
+# ConnectedLine information specifically to a given destination.
+#
+class ExampleForwardingConnectedLineHook(ForwardingConnectedLinePartyIdHook):
+ def modifyForwardingConnectedLine(self, sendingSession, destinationSession, receivedConnectedLine, replacementConnectedLine):
+ result = HookResult()
+ result.status = HookStatus.Succeeded
+
+ # Bar-ify the party names. (We don't really make use of the destinationSession here,
+ # but we could.)
+ ids = receivedConnectedLine.ids[:] # Copy the ids
+ for id in ids:
+ id.partyName = id.partyName + '.bar'
+
+ replacementConnectedLine = AsteriskSCF.SessionCommunications.PartyIdentification.V1.ConnectedLine()
+ replacementConnectedLine = ids
+
+ return (result, replacementConnectedLine)
+
+#
+# This hook is applied when the bridge is about to forward the Redirection information to
+# members of the bridge other than the original sender. This hook can customize the
+# Redirected information specifically to a given destination.
+#
+class ExampleForwardingRedirectionsHook(ForwardingRedirectionsPartyIdHook):
+ def modifyForwardingRedirection(self, sendingSession, destinationSession, receivedRedirection, replacementRedirection):
+ result = HookResult()
+ result.status = HookStatus.Succeeded
+
+ # Let's just provide a made-up redirect.
+
+ replacementRedirection = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Redirection()
+ redirection = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Redirection()
+
+ fromName = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Name('Linda')
+ fromNumber = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Number('800.GET.LOST')
+ fromId = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Id(fromName, fromNumber)
+ redirection.fromId = fromId
+
+ toName = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Name('Jenny')
+ toNumber = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Number('867.5309')
+ toId = AsteriskSCF.SessionCommunications.PartyIdentification.V1.Id(toName, toNumber)
+ redirection.toId = toId
+
+ # Adding a single redirection record here. But you could add more.
+ replacementRedirections.redirects[0] = redirection
+
+ return (result, replacementRedirections)
+
+class ExamplePartyIdHookApp(Ice.Application):
+ def usage(self):
+ """Print usage information for the example Pary Identification hooks"""
+
+ print "Usage: " + self.appName() + " [--locator=stringified service locator proxy]"
+ print "Hook into a Bridge component and alter the party id traffic."
+ print ""
+ print "Mandatory arguments to long options are mandatory for short options too."
+ print "-h, --help display help information"
+ print "-l, --locator=PROXY use specified proxy for service locator"
+
+ def run(self, args):
+ try:
+ opts, arguments = getopt.getopt(args[1:], "hl:", ["help", "locator="])
+ except getopt.GetoptError, err:
+ print str(err)
+ self.usage()
+ return 1
+
+ serviceLocator = None
+ extensionPoint = None
+ serviceLocatorString = "LocatorService:tcp -p 4411"
+
+ for o, a in opts:
+ if o in ("-h", "--help"):
+ self.usage()
+ return 1
+
+ elif o in ("-l", "--locator"):
+ serviceLocatorString = a
+
+ serviceLocator = ServiceLocatorPrx.checkedCast(self.communicator().stringToProxy(serviceLocatorString))
+
+ if serviceLocator == None:
+ print >> sys.stderr, "No service locator proxy specified. For usage details please run " + sys.argv[0] + " --help"
+ return -1
+
+ serviceLocatorParams = ServiceLocatorParams()
+ serviceLocatorParams.category = PartyIdentificationHookLocatorCategory
+ serviceLocatorParams.service = 'default'
+
+ try:
+ service = serviceLocator.locate(serviceLocatorParams)
+ except AsteriskSCF.Core.Discovery.V1.ServiceNotFound:
+ print >> sys.stderr, "Bridge component's Party Id extension point could not be found in service locator."
+ return -1
+
+ extensionPoint = PartyIdentificationExtensionPointPrx.checkedCast(service)
+
+ adapter = self.communicator().createObjectAdapterWithEndpoints("ExamplePartyIdHookApp", "default");
+ adapter.activate();
+
+ receiveConnectedLineHook = ExampleReceivedConnectedLineHook()
+ receiveConnectedLineHookPrx = ReceivedConnectedLinePartyIdHookPrx.uncheckedCast(adapter.addWithUUID(receiveConnectedLineHook))
+
+ forwardConnectedLineHook = ExampleForwardingConnectedLineHook()
+ forwardConnectedLineHookPrx = ForwardingConnectedLinePartyIdHookPrx.uncheckedCast(adapter.addWithUUID(forwardConnectedLineHook))
+
+ forwardRedirectionHook = ExampleForwardingRedirectionsHook()
+ forwardRedirectionHookPrx = ForwardingRedirectionsPartyIdHookPrx.uncheckedCast(adapter.addWithUUID(forwardRedirectionHook))
+
+ print "Hooking into bridge service extension point..."
+ extensionPoint.addReceivedConnectedLinePartyIdHook(receiveConnectedLineHookPrx)
+ extensionPoint.addForwardingConnectedLinePartyIdHook(forwardConnectedLineHookPrx)
+ extensionPoint.addForwardingRedirectionsPartyIdHook(forwardRedirectionHookPrx)
+ print "Hooks added."
+
+ print "Processing until shutdown"
+ self.communicator().waitForShutdown()
+
+ print "Attempting to remove our hooks from the bridge service."
+ extensionPoint.removeReceivedConnectedLinePartyIdHook(receiveConnectedLineHookPrx)
+ extensionPoint.removeForwardingConnectedLinePartyIdHook(forwardConnectedLineHookPrx)
+ extensionPoint.removeForwardingRedirectionsPartyIdHook(forwardRedirectionHookPrx)
+
+ return 0
+
+app = ExamplePartyIdHookApp()
+sys.exit(app.main(sys.argv))
+
commit a4585180c529c953d773cf7eab4ffc356643f158
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 23:45:54 2011 +0200
ASTSCF-289: Enhance Component base class to cope with non-available Service Locator
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index e212132..57c5257 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -7,11 +7,19 @@ BridgeManager.ServiceAdapter.Endpoints=tcp -p 4441
BridgeManager.BackplaneAdapter.Endpoints=tcp -p 4442
BridgeManager.Standalone=yes
BridgeManager.ManagerInterface.ObjectId=BridgeManager
+
+
# this service name property is used when registering this component's
# services with the ServiceLocator. services are registered with
# a Category, Service, and Instance.
BridgeManager.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+BridgeManager.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+BridgeManager.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaFormatGeneric.conf b/configs/MediaFormatGeneric.conf
index bccc4a0..c9e41d5 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -11,6 +11,12 @@ MediaFormatGeneric.Standalone=yes
# a Category, Service, and Instance.
MediaFormatGeneric.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+MediaFormatGeneric.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+MediaFormatGeneric.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaOperationsCore.conf b/configs/MediaOperationsCore.conf
index 6524812..957da17 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -11,6 +11,12 @@ MediaOperationsCore.Standalone=yes
# a Category, Service, and Instance.
MediaOperationsCore.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+MediaOperationsCore.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+MediaOperationsCore.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index c6c8edf..18124b1 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -11,6 +11,12 @@ MediaServiceRTP.Standalone=yes
# a Category, Service, and Instance.
MediaServiceRTP.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+MediaServiceRTP.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+MediaServiceRTP.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/RoutingService.conf b/configs/RoutingService.conf
index 7e471e6..41e6854 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -18,6 +18,12 @@ RoutingService.ServiceName=default
# (category: BridgeManager, service: default)
RoutingService.BridgeServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+RoutingService.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+RoutingService.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index 7791750..95c037f 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -12,6 +12,7 @@ ServiceLocatorStateReplicator.Adapter.Endpoints=tcp -p 4419
# a Category, Service, and Instance.
ServiceLocatorStateReplicator.ServiceName=default
+
# For the logger
LocatorService.Proxy=LocatorService:tcp -p 4411
diff --git a/configs/SipService.conf b/configs/SipService.conf
index f7505db..b030461 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -16,6 +16,12 @@ SipService.ServiceName=default
# be started in this instance
SipService.Modules=Session Logging Registrar
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+SipService.InitServiceLocatorTimeout=30 # minimum: 1, default: 30 (seconds)
+SipService.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/start_astscf.sh b/configs/start_astscf.sh
index 4368436..34c5bb3 100755
--- a/configs/start_astscf.sh
+++ b/configs/start_astscf.sh
@@ -4,7 +4,7 @@
script="$(basename $0)"
-# components[i++]=ServiceDiscovery
+components[i++]=ServiceDiscovery
components[i++]=Logger
components[i++]=MediaFormatGeneric
components[i++]=MediaOperationsCore
@@ -44,9 +44,6 @@ while test $# -gt 0; do
esac
done
-start_component ServiceDiscovery
-sleep 5
-
for comp in "${components[@]}"
do
start_component "${comp}"
-----------------------------------------------------------------------
--
asterisk-scf/integration/examples.git
More information about the asterisk-scf-commits
mailing list