tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert Endpoint::SetClient() change.

This commit is contained in:
Gunnar Beutner 2013-10-18 12:02:35 +02:00
parent e5b3a59aa3
commit dc566bf145
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/cluster/endpoint.cpp
View File

@ -38,11 +38,6 @@ Endpoint::Endpoint(void)
: m_Syncing(false) : m_Syncing(false)
{ } { }
Endpoint::~Endpoint(void)
{
SetClient(Stream::Ptr());
}
/** /**
* Checks whether this endpoint is connected. * Checks whether this endpoint is connected.
* *
@ -63,12 +58,11 @@ void Endpoint::SetClient(const Stream::Ptr& client)
if (m_Client) if (m_Client)
m_Client->Close(); m_Client->Close();
m_Thread.join();
m_Client = client; m_Client = client;
if (client) { if (client) {
m_Thread = boost::thread(boost::bind(&Endpoint::MessageThreadProc, this, client)); boost::thread thread(boost::bind(&Endpoint::MessageThreadProc, this, client));
thread.detach();
OnConnected(GetSelf()); OnConnected(GetSelf());
} }

1
components/cluster/endpoint.h
View File

@ -42,7 +42,6 @@ public:
DECLARE_TYPENAME(Endpoint); DECLARE_TYPENAME(Endpoint);
Endpoint(void); Endpoint(void);
~Endpoint(void);
static boost::signals2::signal<void (const Endpoint::Ptr&)> OnConnected; static boost::signals2::signal<void (const Endpoint::Ptr&)> OnConnected;
static boost::signals2::signal<void (const Endpoint::Ptr&, const Dictionary::Ptr&)> OnMessageReceived; static boost::signals2::signal<void (const Endpoint::Ptr&, const Dictionary::Ptr&)> OnMessageReceived;