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

[Commits to the Asterisk SCF project code repositories]

branch "master" has been updated
       via  1de67641a3e4c2c0bfcfa244a455543af8797ac0 (commit)
       via  0d651e8263be7bee4cbbf00f8e58f4b09e15f447 (commit)
      from  a6453ee3997ea4797c32ebd103a14f60bd6930d5 (commit)

Summary of changes:
 src/PJSipSessionModuleConstruction.cpp |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)


- Log -----------------------------------------------------------------
commit 1de67641a3e4c2c0bfcfa244a455543af8797ac0
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Jun 25 17:15:39 2011 -0300

    Make logging available.

diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index 9c76951..56a0beb 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -14,11 +14,20 @@
  * at the top of the source tree.
  */
 
+#include <AsteriskSCF/logger.h>
 #include <AsteriskSCF/WorkQueue/WorkQueue.h>
 #include <AsteriskSCF/ThreadPool/ThreadPool.h>
 
 #include "PJSipSessionModule.h"
 
+using namespace AsteriskSCF::System::Logging;
+
+namespace
+{
+Logger lg = getLoggerFactory().getLogger("AsteriskSCF.SipSessionManager");
+}
+
+
 namespace AsteriskSCF
 {
 

commit 0d651e8263be7bee4cbbf00f8e58f4b09e15f447
Author: Joshua Colp <jcolp at digium.com>
Date:   Sat Jun 25 17:12:52 2011 -0300

    Okay, NOW this will be compile. Thought it did before but was mistaken.

diff --git a/src/PJSipSessionModuleConstruction.cpp b/src/PJSipSessionModuleConstruction.cpp
index e72d3a4..9c76951 100644
--- a/src/PJSipSessionModuleConstruction.cpp
+++ b/src/PJSipSessionModuleConstruction.cpp
@@ -25,7 +25,7 @@ namespace AsteriskSCF
 namespace SipSessionManager
 {
 
-using namespace AsteriskSCF::WorkQueue::V1;
+using namespace AsteriskSCF::WorkQueue;
 using namespace AsteriskSCF::ThreadPool;
 
 
@@ -163,7 +163,7 @@ PJSipSessionModule::~PJSipSessionModule()
     {
         mPoolQueue->shutdown();
     }
-    catch (const ShuttingDown&)
+    catch (const AsteriskSCF::System::WorkQueue::V1::ShuttingDown&)
     {
         lg(Warning) << "Attempted to shut down a Queue that is already shut down.";
     }

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


-- 
asterisk-scf/release/sip.git