renamed ConnectionHandler::onConnectedO() to ConnectionHandler::onReady()
This commit is contained in:
parent
34f84e1ab7
commit
da6744bf4d
|
|
@ -171,17 +171,19 @@ public:
|
|||
*
|
||||
* @param connection The connection that can now be used
|
||||
*/
|
||||
virtual void onConnected(Connection *connection)
|
||||
virtual void onReady(Connection *connection)
|
||||
{
|
||||
// make sure compilers dont complain about unused parameters
|
||||
(void) connection;
|
||||
}
|
||||
|
||||
/**
|
||||
* Method that is called when the connection was closed.
|
||||
* Method that is called when the AMQP connection was closed.
|
||||
*
|
||||
* This is the counter part of a call to Connection::close() and it confirms
|
||||
* that the connection was _correctly_ closed.
|
||||
* that the connection was _correctly_ closed. Note that this only applies
|
||||
* to the AMQP connection, the underlying TCP connection is not managed by
|
||||
* AMQP-CPP and is still active.
|
||||
*
|
||||
* @param connection The connection that was closed and that is now unusable
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -254,9 +254,9 @@ public:
|
|||
}
|
||||
|
||||
/**
|
||||
* Mark the connection as connected
|
||||
* Mark the connection as ready
|
||||
*/
|
||||
void setConnected();
|
||||
void setReady();
|
||||
|
||||
/**
|
||||
* Retrieve the login data
|
||||
|
|
|
|||
|
|
@ -102,10 +102,10 @@ private:
|
|||
virtual void onError(Connection *connection, const char *message) override;
|
||||
|
||||
/**
|
||||
* Method that is called when the connection is established
|
||||
* Method that is called when the AMQP connection is established
|
||||
* @param connection The connection that can now be used
|
||||
*/
|
||||
virtual void onConnected(Connection *connection) override
|
||||
virtual void onReady(Connection *connection) override
|
||||
{
|
||||
// pass on to the handler
|
||||
_handler->onReady(this);
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ bool ConnectionImpl::sendClose()
|
|||
/**
|
||||
* Mark the connection as connected
|
||||
*/
|
||||
void ConnectionImpl::setConnected()
|
||||
void ConnectionImpl::setReady()
|
||||
{
|
||||
// store connected state
|
||||
_state = state_connected;
|
||||
|
|
@ -316,7 +316,7 @@ void ConnectionImpl::setConnected()
|
|||
Monitor monitor(this);
|
||||
|
||||
// inform handler
|
||||
_handler->onConnected(_parent);
|
||||
_handler->onReady(_parent);
|
||||
|
||||
// the handler could have destructed us
|
||||
if (!monitor.valid()) return;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Message sent by the server to the client to confirm that a connection to
|
||||
* a vhost could be established
|
||||
*
|
||||
* @copyright 2014 Copernica BV
|
||||
* @copyright 2014 - 2018 Copernica BV
|
||||
*/
|
||||
|
||||
/**
|
||||
|
|
@ -79,8 +79,8 @@ public:
|
|||
*/
|
||||
virtual bool process(ConnectionImpl *connection) override
|
||||
{
|
||||
// all is ok, mark the connection as connected
|
||||
connection->setConnected();
|
||||
// all is ok, mark the connection as ready
|
||||
connection->setReady();
|
||||
|
||||
// done
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -77,6 +77,7 @@ void TcpConnection::process(int fd, int flags)
|
|||
// if the state did not change, we do not have to update a member,
|
||||
// when the newstate is nullptr, the object is (being) destructed
|
||||
// and we do not have to do anything else either
|
||||
// @todo what if close(true) is called that install the new TcpClosed() ????
|
||||
if (newstate == nullptr || newstate == _state.get()) return;
|
||||
|
||||
// wrap the new state in a unique-ptr so that so that the old state
|
||||
|
|
|
|||
Loading…
Reference in New Issue