jessequ
/
AMQP-CPP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

when a very short heartbeat timer is installed, the timer did not expire soon enough (the default 60-second timeout was still used for the timer) PLUS when we detect a heartbeat-timeout, we now close the connection with immediate effect (because we do not trust the regular AMQP handshake to do anything, because it is also not respecting heartbeats

This commit is contained in:
Emiel Bruijntjes 2021-09-20 12:47:56 +02:00
parent 4f54507a03
commit e1e83dfba6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/amqpcpp/libev.h
View File

@ -255,8 +255,9 @@ private:
// the server was inactive for a too long period of time, reset state
_next = _expire = 0.0; _timeout = 0;
// close the connection because server was inactive
return (void)_connection->close();
// close the connection because server was inactive (we close it with immediate effect,
// because it was inactive so we cannot trust it to respect the AMQP close handshake)
return (void)_connection->close(true);
}
else if (now >= _next)
{
@ -365,8 +366,16 @@ private:
// because the server has just sent us some data, we will update the expire time too
_expire = now + _timeout * 1.5;
// stop the existing timer (we have to stop it and restart it, because ev_timer_set()
// on its own does not change the running timer) (note that we assume that the timer
// is already running and keeps on running, so no calls to ev_ref()/en_unref() here)
ev_timer_stop(_loop, &_timer);
// find the earliest thing that expires
ev_timer_set(&_timer, std::min(_next, _expire) - now, 0.0);
// and start it again
ev_timer_start(_loop, &_timer);
// expose the accepted interval
return _timeout;