[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  b7ef57dd33f9efa42dc85a5dddd51876c2f0f2ef (commit)
      from  a01a6b277c53958361ff9ec089d89bffcfaaeed0 (commit)

Summary of changes:
 client/config/logging-client.conf    |    5 +---
 server/config/logging-server.conf    |    8 +----
 server/config/testloggingserver.conf |   50 +++++++++++++--------------------
 server/src/main.cpp                  |   10 ++++---
 4 files changed, 29 insertions(+), 44 deletions(-)


- Log -----------------------------------------------------------------
commit b7ef57dd33f9efa42dc85a5dddd51876c2f0f2ef
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Sep 19 14:58:32 2011 -0500

    Logger updates for configuration refactoring.

diff --git a/client/config/logging-client.conf b/client/config/logging-client.conf
index f940860..3488cdb 100644
--- a/client/config/logging-client.conf
+++ b/client/config/logging-client.conf
@@ -2,11 +2,8 @@
 
 AsteriskSCF.LoggingClient.Endpoints=default
 
-# Optionally directly specify LoggerServer proxy string
-#LoggerServer.Proxy=5BC84ACA-3F4C-4B78-BC75-5E6B1CC98680:tcp -h 10.24.21.100 -p 51030
-
 # Where to find the Service Locator.
 LocatorService.Proxy=LocatorService:tcp -p 4411
 
 # A proxy to the IceStorm topic manager
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=ServiceDiscoveryIceStorm/TopicManager:default -p 4421
diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
index 4611cfb..988921a 100644
--- a/server/config/logging-server.conf
+++ b/server/config/logging-server.conf
@@ -4,15 +4,11 @@
 IceBox.InheritProperties=1
 IceBox.Service.Logger=logging-service:createLoggingService
 
-# Ice config
-AsteriskSCF.LoggingService.Endpoints=default
+Logger.ServiceAdapter.Endpoints=tcp -p 4431
 
 # A proxy to the service locator management service
 LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
 
 # A proxy to the IceStorm topic manager
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=ServiceDiscoveryIceStorm/TopicManager:tcp -p 4421
 
-# Log levels
-AsteriskSCF.Logging.logger=Error
-AsteriskSCF.Logging.logger.AsteriskSCF=Info
diff --git a/server/config/testloggingserver.conf b/server/config/testloggingserver.conf
index 537b754..3edbbf4 100644
--- a/server/config/testloggingserver.conf
+++ b/server/config/testloggingserver.conf
@@ -1,51 +1,41 @@
 IceBox.InheritProperties=1
 
 IceBox.Service.ServiceDiscovery=service_locator:create
-
 IceBox.Service.Logger=logging-service:createLoggingService
 IceBox.Service.LoggerTest=LoggingConfigurationTest:create
 
 IceBox.LoadOrder=ServiceDiscovery,Logger,LoggerTest
 
-AsteriskSCF.LoggingService.Endpoints=tcp -p 31337
+Logger.ServiceAdapter.Endpoints=tcp -p 31337
+
+#################################################
+# Properties for test component.
+LoggerTestAdapter.Endpoints=default
 LoggerConfiguration.Proxy=LoggerConfigurationService:tcp -p 31337
 
 # A proxy to the service locator management service
-LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
-ServiceLocatorManagementAdapter.Endpoints=tcp -p 4422
-ServiceLocatorAdapter.Endpoints=tcp -p 4411
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4412
 LocatorService.Proxy=LocatorService:tcp -p 4411
-ServiceLocatorLocalAdapter.Endpoints=tcp -p 4412
 
 # Test endpoints for IceStorm
-TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
+TopicManager.Proxy=ServiceDiscoveryIceStorm/TopicManager:default -p 4421
+
+#################################################
+# Properties for service locator
+ServiceDiscovery.BackplaneAdapter.Endpoints=tcp -p 4410
+ServiceDiscovery.Management.ServiceAdapter.Endpoints=tcp -p 4412
+ServiceDiscovery.Locator.ServiceAdapter.Endpoints=tcp -p 4411
+ServiceDiscovery.IceStorm.InstanceName=ServiceDiscovery
+
 
-AsteriskSCFIceStorm.InstanceName=AsteriskSCFIceStorm
-#
 # This property defines the endpoints on which the IceStorm
 # TopicManager listens.
 #
-AsteriskSCFIceStorm.TopicManager.Endpoints=default -p 10000
-
-#
-# This property defines the endpoints on which the topic
-# publisher objects listen. If you want to federate
-# IceStorm instances this must run on a fixed port (or use
-# IceGrid).
-#
-AsteriskSCFIceStorm.Publish.Endpoints=tcp -p 10001:udp -p 10001
 
-#
-# TopicManager Tracing
-#
-# 0 = no tracing
-# 1 = trace topic creation, subscription, unsubscription
-# 2 = like 1, but with more detailed subscription information
-#
-AsteriskSCFIceStorm.Trace.TopicManager=2
-AsteriskSCFIceStorm.Transient=1
+ServiceDiscovery.IceStorm.TopicManager.Endpoints=default -p 4421
+ServiceDiscovery.IceStorm.Publish.Endpoints=tcp -p 4422:udp -p 4422
+ServiceDiscovery.IceStorm.Trace.TopicManager=2
+ServiceDiscovery.IceStorm.Transient=1
+ServiceDiscovery.IceStorm.Flush.Timeout=2000
 
-#
-AsteriskSCFIceStorm.Flush.Timeout=2000
 
-LoggerTestAdapter.Endpoints=default
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 211b3d8..63ef85a 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -32,7 +32,6 @@ using namespace AsteriskSCF::System::Configuration::V1;
 
 namespace
 {
-const std::string AdapterName = "AsteriskSCF.LoggingService";
 const std::string ConfigurationServiceId = "LoggerConfigurationService";
 
 class LoggingService : public IceBox::Service
@@ -46,6 +45,7 @@ private:
     Ice::ObjectAdapterPtr mAdapter;
     ServiceManagementPrx mServiceManagement;
     ConfigurationServicePtr mConfigurationService;
+    std::string mName;
 
     void registerWithServiceLocator(const Ice::CommunicatorPtr& communicator,
         const LoggingServerPrx& serverProxy);
@@ -96,7 +96,7 @@ void LoggingService::setupDefaultProperties(const Ice::CommunicatorPtr& communic
 {
     Ice::PropertiesPtr props = communicator->getProperties();
 
-    setDefaultProperty(*props, AdapterName + ".Endpoints", "default");
+    setDefaultProperty(*props, mName + "ServiceAdapter.Endpoints", "default");
 }
 
 void LoggingService::setDefaultProperty(Ice::Properties& props,
@@ -108,13 +108,15 @@ void LoggingService::setDefaultProperty(Ice::Properties& props,
     }
 }
 
-void LoggingService::start(const std::string&,
+void LoggingService::start(const std::string& name,
     const Ice::CommunicatorPtr& communicator,
     const Ice::StringSeq&)
 {
+    mName = name;
+
     setupDefaultProperties(communicator);
 
-    mAdapter = communicator->createObjectAdapter(AdapterName);
+    mAdapter = communicator->createObjectAdapter(mName + ".ServiceAdapter");
 
     ServerConfigurationListenerPrx configurationListener;
 

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


-- 
asterisk-scf/release/logger.git