[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  7d3ca9ec1f0dd4e2deb1b1b31ea30ed3bf3dc2f0 (commit)
      from  81ea1d5f5b6668733c15da3a30dd128d5295faac (commit)

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


- Log -----------------------------------------------------------------
commit 7d3ca9ec1f0dd4e2deb1b1b31ea30ed3bf3dc2f0
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Mon Mar 21 19:59:26 2011 -0500

    Fixed several issues discovered during UTF string testing.
     - ConfiguredIceLogger.cpp - Constructor initialization was commented out.
     - Others: The LocatorServiceMangement.Proxy property was named differently from every other components reference to that proxy, requiring duplicate config entries.

diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index 42622c6..c27d05b 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -66,7 +66,7 @@ ConfiguredIceLogger::ConfiguredIceLogger(const LoggingServerPrx& server)
 ConfiguredIceLogger::ConfiguredIceLogger(const ServiceLocatorPrx& locator) :
     mLocator(locator)
 {
-    //updateLoggerFromServiceLocator();
+    updateLoggerFromServiceLocator();
 }
 
 void ConfiguredIceLogger::updateLoggerFromServiceLocator()
diff --git a/server/config/logging-server.conf b/server/config/logging-server.conf
index 0cf4f37..4611cfb 100644
--- a/server/config/logging-server.conf
+++ b/server/config/logging-server.conf
@@ -8,7 +8,7 @@ IceBox.Service.Logger=logging-service:createLoggingService
 AsteriskSCF.LoggingService.Endpoints=default
 
 # A proxy to the service locator management service
-ServiceLocatorManagement.Proxy=LocatorServiceManagement:tcp -p 4422
+LocatorServiceManagement.Proxy=LocatorServiceManagement:tcp -p 4422
 
 # A proxy to the IceStorm topic manager
 TopicManager.Proxy=AsteriskSCFIceStorm/TopicManager:default -p 10000
diff --git a/server/src/main.cpp b/server/src/main.cpp
index 7f1d5ca..90d2abc 100644
--- a/server/src/main.cpp
+++ b/server/src/main.cpp
@@ -58,9 +58,10 @@ void LoggingService::registerWithServiceLocator(
 {
     try
     {
+        std::string locatorServiceProxyStr("LocatorServiceManagement.Proxy");
         std::string locatorManagementProxyString =
             communicator->getProperties()->getProperty(
-                "ServiceLocatorManagement.Proxy");
+               locatorServiceProxyStr);
         if (!locatorManagementProxyString.empty())
         {
             ServiceLocatorManagementPrx management =
@@ -72,6 +73,10 @@ void LoggingService::registerWithServiceLocator(
                 LoggingServerCategory);
             mServiceManagement->addLocatorParams(params, "");
         }
+        else
+        {
+            std::clog << locatorServiceProxyStr << " not defined. ";
+        }
     }
     catch (const std::exception& e)
     {

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


-- 
asterisk-scf/release/logger.git