[asterisk-scf-commits] asterisk-scf/integration/logger.git branch "retry_deux" updated.

[Commits to the Asterisk SCF project code repositories]

branch "retry_deux" has been updated
       via  0ba350316c6f85bf96306a24ccdafd35385ab702 (commit)
       via  b86a7c2efc2c452bd084ee282ffaf389cad9b392 (commit)
      from  a1c6ba6eaec09951bb6bfdd294a08d4b66bcedb5 (commit)

Summary of changes:
 client/src/IceLogger.cpp               |   25 +++++++++++++++++++------
 include/AsteriskSCF/Logger/IceLogger.h |   24 ++++++++++++++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit 0ba350316c6f85bf96306a24ccdafd35385ab702
Merge: b86a7c2 a1c6ba6
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Feb 15 18:43:52 2012 -0600

    Merge branch 'retry_deux' of git.asterisk.org:asterisk-scf/integration/logger into retry_deux


commit b86a7c2efc2c452bd084ee282ffaf389cad9b392
Author: Ken Hunt <ken.hunt at digium.com>
Date:   Wed Feb 15 18:42:22 2012 -0600

    Updates for OperationContext propagation.

diff --git a/client/src/IceLogger.cpp b/client/src/IceLogger.cpp
index ca1a7f7..78c6170 100644
--- a/client/src/IceLogger.cpp
+++ b/client/src/IceLogger.cpp
@@ -27,6 +27,7 @@
 
 using namespace AsteriskSCF::Core::Discovery::V1;
 using namespace AsteriskSCF::System::Logging;
+using namespace AsteriskSCF::System::V1;
 
 void IceLogger::logs(const std::string& name, Level logLevel,
     const std::string& message)
@@ -169,19 +170,25 @@ void ConfiguredIceLogger::locateFinished(const Ice::AsyncResultPtr& r)
     }
 }
 
-void ConfiguredIceLogger::comparisonRegistered(const std::string& /* guid */,
+void ConfiguredIceLogger::comparisonRegistered(
+    const OperationContextPtr& operationContext,
+    const std::string& /* guid */,
     const Ice::Current&)
 {
     // no-op
 }
 
-void ConfiguredIceLogger::comparisonUnregistered(const std::string& /* guid */,
+void ConfiguredIceLogger::comparisonUnregistered(
+    const OperationContextPtr& operationContext,
+    const std::string& /* guid */,
     const Ice::Current&)
 {
     // no-op
 }
 
-void ConfiguredIceLogger::serviceRegistered(const std::string& guid,
+void ConfiguredIceLogger::serviceRegistered(
+    const OperationContextPtr& operationContext,
+    const std::string& guid,
     const Ice::Current&)
 {
     if (guid == LoggingServerGuid)
@@ -190,7 +197,9 @@ void ConfiguredIceLogger::serviceRegistered(const std::string& guid,
     }
 }
 
-void ConfiguredIceLogger::serviceUnregistered(const std::string& guid,
+void ConfiguredIceLogger::serviceUnregistered(
+    const OperationContextPtr& operationContext,
+    const std::string& guid,
     const Ice::Current&)
 {
     if (guid == LoggingServerGuid)
@@ -199,7 +208,9 @@ void ConfiguredIceLogger::serviceUnregistered(const std::string& guid,
     }
 }
 
-void ConfiguredIceLogger::serviceSuspended(const std::string& guid,
+void ConfiguredIceLogger::serviceSuspended(
+    const OperationContextPtr& operationContext,
+    const std::string& guid,
     const Ice::Current&)
 {
     if (guid == LoggingServerGuid)
@@ -208,7 +219,9 @@ void ConfiguredIceLogger::serviceSuspended(const std::string& guid,
     }
 }
 
-void ConfiguredIceLogger::serviceUnsuspended(const std::string& guid,
+void ConfiguredIceLogger::serviceUnsuspended(
+    const OperationContextPtr& operationContext,
+    const std::string& guid,
     const Ice::Current&)
 {
     if (guid == LoggingServerGuid)
diff --git a/include/AsteriskSCF/Logger/IceLogger.h b/include/AsteriskSCF/Logger/IceLogger.h
index dbac457..80488e1 100644
--- a/include/AsteriskSCF/Logger/IceLogger.h
+++ b/include/AsteriskSCF/Logger/IceLogger.h
@@ -74,12 +74,24 @@ public:
 
     void updateLoggerFromServiceLocator();
 
-    void comparisonRegistered(const std::string& guid, const Ice::Current&);
-    void comparisonUnregistered(const std::string& guid, const Ice::Current&);
-    void serviceRegistered(const std::string& guid, const Ice::Current&);
-    void serviceUnregistered(const std::string& guid, const Ice::Current&);
-    void serviceSuspended(const std::string& guid, const Ice::Current&);
-    void serviceUnsuspended(const std::string& guid, const Ice::Current&);
+    void comparisonRegistered(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
+    void comparisonUnregistered(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
+    void serviceRegistered(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
+    void serviceUnregistered(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
+    void serviceSuspended(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
+    void serviceUnsuspended(
+        const AsteriskSCF::System::V1::OperationContextPtr& operationContext,
+        const std::string& guid, const Ice::Current&);
 
 protected:
     /**

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


-- 
asterisk-scf/integration/logger.git