redisCheckSocketError should only CheckSocketError and not
close any misbehaving sockets. If CheckSocketError discovers
a problem, the caller will discover the contest is in ERR
and will start destroying the context (which involves
finalizing all callbacks (which may still be using
fd for something, so we should not close fd until all
callbacks have been told we are failing) and eventually
close the fd in redisFree() immediately before the
context is released).
With all the async connects and disconnects and error handling
going on in hiredis, we need to centralize how we close our fd
and set it so it doesn't get re-closed. Prior to this commit,
sometimes we'd close(fd), run an async error handler, then
call close(fd) again.
To stop multiple closes, we now set fd to -1 after we free it,
but that requires not passing fd as an independent argument to
functions.
This commit moves all fd usage to c->fd. Since the context
has a fd field and all functions receive the context, it makes
more sense to use the fd inside of c instead of passing along fd
as an independent argument.
Also, by only using c->fd, we can set c->fd after we close it to
signify we shouldn't re-close the same fd again.
This does change one semi-public interface function redisCheckSocketError()
to only take (context) instead of (context, fd). A search on github
returned zero occasions of people using redisCheckSocketError()
outside of net.{c,h} in hiredis itself.
Commit inspired by the bug report at:
https://groups.google.com/forum/#!topic/redis-db/mQm46XkIPOY
Thanks go out to Thijs for trying high-frequency reconnects on
a host that isn't there.
Closes#230
The struct timeval argument in redisConnectWithTimeout(),
redisConnectUnixWithTimeout(), redisSetTimeout(),
redisContextSetTimeout(), redisContextConnectTcp()
and redisContextConnectUnix() is never modified and can
therefore be marked as const.
Signed-off-by: Noah Williamsson <noah.williamsson@gmail.com>
Closes#154
This commit properly sets the error value inside of
redisContextWaitReady when an invalid sec or usec value is provided.
Tests for each case are provided to demonstrate that the issue is
properly fixed and to avoid regression.
Signed-off-by: Aaron Bedra <aaron@aaronbedra.com>
