Fixed deps between conn and proto.

[stg.git] / projects / rlm_stg / stg_client.cpp

diff --git a/projects/rlm_stg/stg_client.cpp b/projects/rlm_stg/stg_client.cpp
index 199aca905df76b3c5ba703fa21b35d7f42b907e1..6987976b7d44bf011ec4bb8d406fd538601dcb26 100644 (file)
--- a/projects/rlm_stg/stg_client.cpp
+++ b/projects/rlm_stg/stg_client.cpp
@@ -22,6 +22,8 @@
 
 #include "stg/common.h"
 
+#include <boost/bind.hpp>
+
 #include <stdexcept>
 
 namespace {
@@ -80,17 +82,19 @@ ChannelConfig::ChannelConfig(std::string addr)
 
 STG_CLIENT::STG_CLIENT(const std::string& address)
     : m_config(address),
-      m_proto(m_config.transport, m_config.key)
+      m_proto(m_config.transport, m_config.key),
+      m_thread(boost::bind(&STG_CLIENT::m_run, this))
 {
-    try {
-        m_proto.connect(m_config.address, m_config.port);
-    } catch (const STG::SGCP::Proto::Error& ex) {
-        throw Error(ex.what());
-    }
 }
 
 STG_CLIENT::~STG_CLIENT()
 {
+    stop();
+}
+
+bool STG_CLIENT::stop()
+{
+    return m_proto.stop();
 }
 
 RESULT STG_CLIENT::request(TYPE type, const std::string& userName, const std::string& password, const PAIRS& pairs)
@@ -110,7 +114,7 @@ STG_CLIENT* STG_CLIENT::get()
 
 bool STG_CLIENT::configure(const std::string& address)
 {
-    if ( stgClient != NULL )
+    if ( stgClient != NULL && stgClient->stop() )
         delete stgClient;
     try {
         stgClient = new STG_CLIENT(address);
@@ -161,3 +165,9 @@ PAIRS STG_CLIENT::m_readPairBlock()
         throw Error(ex.what());
     }
 }
+
+void STG_CLIENT::m_run()
+{
+    m_proto.connect(m_config.address, m_config.port);
+    m_proto.run();
+}