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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  cc3eee6c90fcb07de28d2e40d25d491f9371ec18 (commit)
      from  f09864c318aef8135d49204db7d268a0e56bef11 (commit)

Summary of changes:
 server/config/logging-server.conf    |    2 +-
 server/config/testloggingserver.conf |    3 +--
 server/src/main.cpp                  |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)


- Log -----------------------------------------------------------------
commit cc3eee6c90fcb07de28d2e40d25d491f9371ec18
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Tue Sep 20 12:04:16 2011 -0500

    Fix the ServiceAdapter name construction.

diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
index 988921a..51ccfda 100644
--- a/server/config/logging-server.conf
+++ b/server/config/logging-server.conf
@@ -7,7 +7,7 @@ IceBox.Service.Logger=logging-service:createLoggingService
 Logger.ServiceAdapter.Endpoints=tcp -p 4431
 
 # A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
 
 # A proxy to the IceStorm topic manager
 TopicManager.Proxy=ServiceDiscoveryIceStorm/TopicManager:tcp -p 4421
diff --git a/server/config/testloggingserver.conf b/server/config/testloggingserver.conf
index 3edbbf4..29d0976 100644
--- a/server/config/testloggingserver.conf
+++ b/server/config/testloggingserver.conf
@@ -18,7 +18,7 @@ LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
 LocatorService.Proxy=LocatorService:tcp -p 4411
 
 # Test endpoints for IceStorm
-TopicManager.Proxy=ServiceDiscoveryIceStorm/TopicManager:default -p 4421
+TopicManager.Proxy=ServiceDiscovery/TopicManager:default -p 4421
 
 #################################################
 # Properties for service locator
@@ -27,7 +27,6 @@ ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
 ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
 ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
 
-
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 63ef85a..72edb51 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -96,7 +96,7 @@ void LoggingService::setupDefaultProperties(const Ice::CommunicatorPtr& communic
 {
     Ice::PropertiesPtr props = communicator->getProperties();
 
-    setDefaultProperty(*props, mName + "ServiceAdapter.Endpoints", "default");
+    setDefaultProperty(*props, mName + ".ServiceAdapter.Endpoints", "default");
 }
 
 void LoggingService::setDefaultProperty(Ice::Properties& props,

-----------------------------------------------------------------------


-- 
asterisk-scf/release/logger.git