[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
Fri Aug 24 09:35:35 CDT 2012
branch "master" has been updated
via 37399ca6728d3aede342ffc76cc1c8e8a67000b9 (commit)
via 2d9ce3f792ce323010ea59367fe0ff0bc7e707eb (commit)
via db339a370fda09ccee44a300fec4ddc0d26ae0dc (commit)
via 68818a8b3040d9be3ff9fa91a186ddfa8e54f366 (commit)
via 4b4f33bb9e3edbc27c34a2541d3266bcfb8805e5 (commit)
via 023fb3966f842d31def42c7d80e854e14cfd7093 (commit)
via beece91f512542e270e7f781fbb4c53ca3d26b9a (commit)
via dea70b5111a08460020562b45b48fdbb67f84d8a (commit)
from 5270031a9df66d86f3a8fc5d465b0c2d72897612 (commit)
Summary of changes:
configs/BridgeManager.conf | 2 +-
configs/SipService.conf | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
- Log -----------------------------------------------------------------
commit 37399ca6728d3aede342ffc76cc1c8e8a67000b9
Merge: 2d9ce3f db339a3
Author: David M. Lee <dlee at digium.com>
Date: Fri Aug 24 09:28:45 2012 -0500
Merge branch 'basecomponentfix' of git://git.asterisk.org/asterisk-scf/integration/examples
Conflicts:
configs/BridgeManager.conf
diff --cc configs/SipService.conf
index a519262,b030461..09f39bc
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@@ -15,17 -14,14 +15,23 @@@ SipService.Standalone=ye
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
+
+SipService.SIP.Modules.Session.ThreadPool.DefaultSize=50
+SipService.SIP.Modules.Session.ThreadPool.MaxSize=80
+
+# 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)
+ # 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
commit 2d9ce3f792ce323010ea59367fe0ff0bc7e707eb
Author: David M. Lee <dlee at digium.com>
Date: Fri Aug 24 09:28:01 2012 -0500
Fixed BridgeManager config
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index a5fa508..30b8fb3 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -7,7 +7,7 @@ IceBox.Service.BridgeManager=BridgeService:create
BridgeManager.ServiceAdapter.Endpoints=tcp -p 4441
BridgeManager.BackplaneAdapter.Endpoints=tcp -p 4442
BridgeManager.Standalone=yes
-BridgeManager.ManagerInterface.ObjectId=BridgeManager
+BridgeManager.BridgeManagerObjectId=BridgeManager
# this service name property is used when registering this component's
commit db339a370fda09ccee44a300fec4ddc0d26ae0dc
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 22:58:51 2011 +0200
squash! removed InitLocatorService properties from RoutingStateReplicator.conf
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index 3bd3d4b..717ed84 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -12,12 +12,6 @@ RoutingStateReplicator.Adapter.Endpoints=tcp -p 4459
# a Category, Service, and Instance.
RoutingStateReplicator.ServiceName=default
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-RoutingStateReplicator.InitServiceLocatorTimeout=30 # min: 1
-RoutingStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
-
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
commit 68818a8b3040d9be3ff9fa91a186ddfa8e54f366
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 22:55:27 2011 +0200
squash! added colon after 'default'
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index 0124485..57c5257 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -18,7 +18,7 @@ BridgeManager.ServiceName=default
# 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)
+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 7bfcdce..c9e41d5 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -15,7 +15,7 @@ MediaFormatGeneric.ServiceName=default
# 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)
+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 97fc373..957da17 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -15,7 +15,7 @@ MediaOperationsCore.ServiceName=default
# 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)
+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 86a9093..18124b1 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -15,7 +15,7 @@ MediaServiceRTP.ServiceName=default
# 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)
+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 11a8130..41e6854 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -22,7 +22,7 @@ RoutingService.BridgeServiceName=default
# 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)
+RoutingService.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/SipService.conf b/configs/SipService.conf
index ffb3eaf..b030461 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -20,7 +20,7 @@ SipService.Modules=Session Logging Registrar
# 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)
+SipService.InitServiceLocatorRetryDelay=2 # minimum: 1, default: 2 (seconds)
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
commit 4b4f33bb9e3edbc27c34a2541d3266bcfb8805e5
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 22:26:23 2011 +0200
Updated end-of-line comments in config files
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index fb3a0b3..0124485 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -17,8 +17,8 @@ BridgeManager.ServiceName=default
# These properties define the total timeout and delay
# per try in seconds for initialization of the
# service locator
-BridgeManager.InitServiceLocatorTimeout=30 # min: 1
-BridgeManager.InitServiceLocatorRetryDelay=2 # min: 1
+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 de99570..7bfcdce 100644
--- a/configs/MediaFormatGeneric.conf
+++ b/configs/MediaFormatGeneric.conf
@@ -14,8 +14,8 @@ MediaFormatGeneric.ServiceName=default
# These properties define the total timeout and delay
# per try in seconds for initialization of the
# service locator
-MediaFormatGeneric.InitServiceLocatorTimeout=30 # min: 1
-MediaFormatGeneric.InitServiceLocatorRetryDelay=2 # min: 1
+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 592e677..97fc373 100644
--- a/configs/MediaOperationsCore.conf
+++ b/configs/MediaOperationsCore.conf
@@ -14,8 +14,8 @@ MediaOperationsCore.ServiceName=default
# These properties define the total timeout and delay
# per try in seconds for initialization of the
# service locator
-MediaOperationsCore.InitServiceLocatorTimeout=30 # min: 1
-MediaOperationsCore.InitServiceLocatorRetryDelay=2 # min: 1
+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 3c41a68..86a9093 100644
--- a/configs/MediaServiceRTP.conf
+++ b/configs/MediaServiceRTP.conf
@@ -14,8 +14,8 @@ MediaServiceRTP.ServiceName=default
# These properties define the total timeout and delay
# per try in seconds for initialization of the
# service locator
-MediaServiceRTP.InitServiceLocatorTimeout=30 # min: 1
-MediaServiceRTP.InitServiceLocatorRetryDelay=2 # min: 1
+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 8eb5758..11a8130 100644
--- a/configs/RoutingService.conf
+++ b/configs/RoutingService.conf
@@ -21,8 +21,8 @@ RoutingService.BridgeServiceName=default
# These properties define the total timeout and delay
# per try in seconds for initialization of the
# service locator
-RoutingService.InitServiceLocatorTimeout=30 # min: 1
-RoutingService.InitServiceLocatorRetryDelay=2 # min: 1
+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/SipService.conf b/configs/SipService.conf
index 0ccc2ad..ffb3eaf 100644
--- a/configs/SipService.conf
+++ b/configs/SipService.conf
@@ -19,8 +19,8 @@ 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 # min: 1
-SipService.InitServiceLocatorRetryDelay=2 # min: 1
+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
commit 023fb3966f842d31def42c7d80e854e14cfd7093
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 21:58:35 2011 +0200
Removed Timeout properties from Logger.conf
diff --git a/configs/Logger.conf b/configs/Logger.conf
index 2f72540..76459b6 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -3,12 +3,6 @@ IceBox.Service.Logger=logging-service:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-Logger.InitServiceLocatorTimeout=30 # min: 1
-Logger.InitServiceLocatorRetryDelay=2 # min: 1
-
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
# this is used to connect to the IceStorm instance that lives in the same IceBox
commit beece91f512542e270e7f781fbb4c53ca3d26b9a
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 21:20:30 2011 +0200
Free'd Replicator config files from InitServiceLocator(RetryDelay/Timeout)
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index 4772576..fb3a0b3 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -8,17 +8,18 @@ BridgeManager.BackplaneAdapter.Endpoints=tcp -p 4442
BridgeManager.Standalone=yes
BridgeManager.ManagerInterface.ObjectId=BridgeManager
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-BridgeManager.InitServiceLocatorTimeout=30 # min: 1
-BridgeManager.InitServiceLocatorRetryDelay=2 # min: 1
# 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 # min: 1
+BridgeManager.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/BridgeStateReplicator.conf b/configs/BridgeStateReplicator.conf
index cb89280..9bf283a 100644
--- a/configs/BridgeStateReplicator.conf
+++ b/configs/BridgeStateReplicator.conf
@@ -7,12 +7,6 @@ BridgeReplicator.Adapter.ThreadPool.Size=4
BridgeReplicator.Adapter.Endpoints=tcp -p 4491
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-BridgeReplicator.InitServiceLocatorTimeout=30 # min: 1
-BridgeReplicator.InitServiceLocatorRetryDelay=2 # min: 1
-
# this service name property is used when registering this component's
# services with the ServiceLocator. services are registered with
# a Category, Service, and Instance.
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index 3feb9c3..af3f963 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -12,12 +12,6 @@ MediaOperationsCoreReplicator.Adapter.Endpoints=tcp -p 4489
# a Category, Service, and Instance.
MediaOperationsCoreReplicator.ServiceName=default
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-MediaOperationsCoreReplicator.InitServiceLocatorTimeout=30 # min: 1
-MediaOperationsCoreReplicator.InitServiceLocatorRetryDelay=2 # min: 1
-
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index e1102af..12da59e 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -21,12 +21,6 @@ RtpStateReplicator.IceStorm.Flush.Timeout=2000
# a Category, Service, and Instance.
RtpStateReplicator.ServiceName=default
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-RtpStateReplicator.InitServiceLocatorTimeout=30 # min: 1
-RtpStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
-
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index 2b1476e..95c037f 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -12,11 +12,6 @@ ServiceLocatorStateReplicator.Adapter.Endpoints=tcp -p 4419
# a Category, Service, and Instance.
ServiceLocatorStateReplicator.ServiceName=default
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-ServiceLocatorStateReplicator.InitServiceLocatorTimeout=30 # min: 1
-ServiceLocatorStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
# For the logger
LocatorService.Proxy=LocatorService:tcp -p 4411
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 74b1d05..385a3b7 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -21,12 +21,6 @@ SipStateReplicator.IceStorm.Flush.Timeout=2000
# a Category, Service, and Instance.
SipStateReplicator.ServiceName=default
-# These properties define the total timeout and delay
-# per try in seconds for initialization of the
-# service locator
-SipStateReplicator.InitServiceLocatorTimeout=30 # min: 1
-SipStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
-
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
commit dea70b5111a08460020562b45b48fdbb67f84d8a
Author: Benjamin Oldenburg <benjamin.oldenburg at bericom.eu>
Date: Mon Sep 26 21:10:30 2011 +0200
Config files changes in accordance to ASTSCF-289
diff --git a/configs/BridgeManager.conf b/configs/BridgeManager.conf
index e212132..4772576 100644
--- a/configs/BridgeManager.conf
+++ b/configs/BridgeManager.conf
@@ -7,6 +7,13 @@ BridgeManager.ServiceAdapter.Endpoints=tcp -p 4441
BridgeManager.BackplaneAdapter.Endpoints=tcp -p 4442
BridgeManager.Standalone=yes
BridgeManager.ManagerInterface.ObjectId=BridgeManager
+
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+BridgeManager.InitServiceLocatorTimeout=30 # min: 1
+BridgeManager.InitServiceLocatorRetryDelay=2 # min: 1
+
# this service name property is used when registering this component's
# services with the ServiceLocator. services are registered with
# a Category, Service, and Instance.
diff --git a/configs/BridgeStateReplicator.conf b/configs/BridgeStateReplicator.conf
index 9bf283a..cb89280 100644
--- a/configs/BridgeStateReplicator.conf
+++ b/configs/BridgeStateReplicator.conf
@@ -7,6 +7,12 @@ BridgeReplicator.Adapter.ThreadPool.Size=4
BridgeReplicator.Adapter.Endpoints=tcp -p 4491
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+BridgeReplicator.InitServiceLocatorTimeout=30 # min: 1
+BridgeReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
# this service name property is used when registering this component's
# services with the ServiceLocator. services are registered with
# a Category, Service, and Instance.
diff --git a/configs/Logger.conf b/configs/Logger.conf
index 76459b6..2f72540 100644
--- a/configs/Logger.conf
+++ b/configs/Logger.conf
@@ -3,6 +3,12 @@ IceBox.Service.Logger=logging-service:createLoggingService
Logger.ServiceAdapter.Endpoints=tcp -p 4431
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+Logger.InitServiceLocatorTimeout=30 # min: 1
+Logger.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
# this is used to connect to the IceStorm instance that lives in the same IceBox
diff --git a/configs/MediaFormatGeneric.conf b/configs/MediaFormatGeneric.conf
index bccc4a0..de99570 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 # min: 1
+MediaFormatGeneric.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaOperationCoreStateReplicator.conf b/configs/MediaOperationCoreStateReplicator.conf
index af3f963..3feb9c3 100644
--- a/configs/MediaOperationCoreStateReplicator.conf
+++ b/configs/MediaOperationCoreStateReplicator.conf
@@ -12,6 +12,12 @@ MediaOperationsCoreReplicator.Adapter.Endpoints=tcp -p 4489
# a Category, Service, and Instance.
MediaOperationsCoreReplicator.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+MediaOperationsCoreReplicator.InitServiceLocatorTimeout=30 # min: 1
+MediaOperationsCoreReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaOperationsCore.conf b/configs/MediaOperationsCore.conf
index 6524812..592e677 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 # min: 1
+MediaOperationsCore.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaServiceRTP.conf b/configs/MediaServiceRTP.conf
index c6c8edf..3c41a68 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 # min: 1
+MediaServiceRTP.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/MediaServiceRTPStateReplicator.conf b/configs/MediaServiceRTPStateReplicator.conf
index 12da59e..e1102af 100644
--- a/configs/MediaServiceRTPStateReplicator.conf
+++ b/configs/MediaServiceRTPStateReplicator.conf
@@ -21,6 +21,12 @@ RtpStateReplicator.IceStorm.Flush.Timeout=2000
# a Category, Service, and Instance.
RtpStateReplicator.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+RtpStateReplicator.InitServiceLocatorTimeout=30 # min: 1
+RtpStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/RoutingService.conf b/configs/RoutingService.conf
index 7e471e6..8eb5758 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 # min: 1
+RoutingService.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/RoutingStateReplicator.conf b/configs/RoutingStateReplicator.conf
index 717ed84..3bd3d4b 100644
--- a/configs/RoutingStateReplicator.conf
+++ b/configs/RoutingStateReplicator.conf
@@ -12,6 +12,12 @@ RoutingStateReplicator.Adapter.Endpoints=tcp -p 4459
# a Category, Service, and Instance.
RoutingStateReplicator.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+RoutingStateReplicator.InitServiceLocatorTimeout=30 # min: 1
+RoutingStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/ServiceDiscoveryStateReplicator.conf b/configs/ServiceDiscoveryStateReplicator.conf
index 7791750..2b1476e 100644
--- a/configs/ServiceDiscoveryStateReplicator.conf
+++ b/configs/ServiceDiscoveryStateReplicator.conf
@@ -12,6 +12,12 @@ ServiceLocatorStateReplicator.Adapter.Endpoints=tcp -p 4419
# a Category, Service, and Instance.
ServiceLocatorStateReplicator.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+ServiceLocatorStateReplicator.InitServiceLocatorTimeout=30 # min: 1
+ServiceLocatorStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
# For the logger
LocatorService.Proxy=LocatorService:tcp -p 4411
diff --git a/configs/SipService.conf b/configs/SipService.conf
index f7505db..0ccc2ad 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 # min: 1
+SipService.InitServiceLocatorRetryDelay=2 # min: 1
+
LocatorService.Proxy=LocatorService:tcp -p 4411
LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
diff --git a/configs/SipStateReplicator.conf b/configs/SipStateReplicator.conf
index 385a3b7..74b1d05 100644
--- a/configs/SipStateReplicator.conf
+++ b/configs/SipStateReplicator.conf
@@ -21,6 +21,12 @@ SipStateReplicator.IceStorm.Flush.Timeout=2000
# a Category, Service, and Instance.
SipStateReplicator.ServiceName=default
+# These properties define the total timeout and delay
+# per try in seconds for initialization of the
+# service locator
+SipStateReplicator.InitServiceLocatorTimeout=30 # min: 1
+SipStateReplicator.InitServiceLocatorRetryDelay=2 # min: 1
+
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
More information about the asterisk-scf-commits
mailing list