[asterisk-scf-commits] asterisk-scf/examples.git branch "master" updated.

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  a4585180c529c953d773cf7eab4ffc356643f158 (commit)
      from  1364e824c56415e088cdec1caaaaaeb5e6dd757f (commit)

Summary of changes:
 configs/BridgeManager.conf                   |    8 ++++++++
 configs/MediaFormatGeneric.conf              |    6 ++++++
 configs/MediaOperationsCore.conf             |    6 ++++++
 configs/MediaServiceRTP.conf                 |    6 ++++++
 configs/RoutingService.conf                  |    6 ++++++
 configs/ServiceDiscoveryStateReplicator.conf |    1 +
 configs/SipService.conf                      |    6 ++++++
 configs/start_astscf.sh                      |    5 +----
 8 files changed, 40 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
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/examples.git