Skip to content

retry _call if connection times out #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

retry _call if connection times out #128

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e7c250
Use epoll to detect bitcoind closing the connection
Jan 23, 2017
16e84b9
epoll fix
stefanlenoach Feb 2, 2017
995d7e0
fix
stefanlenoach Feb 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions bitcoin/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@
import os
import platform
import sys
import socket

try:
from socket import MSG_PEEK, MSG_DONTWAIT
import select
from select import EPOLLIN, EPOLLHUP
EPOLL = True
except ImportError:
EPOLL = False


try:
import urllib.parse as urlparse
except ImportError:
Expand Down Expand Up @@ -183,11 +194,19 @@ def __init__(self,

self.__conn = httplib.HTTPConnection(self.__url.hostname, port=port,
timeout=timeout)
self.ep = None


def _call(self, service_name, *args):
self.__id_count += 1

if EPOLL and self.ep:
for (fd, ev) in self.ep.poll(0):
if ev & EPOLLHUP or (ev & EPOLLIN and \
b'' == self.__conn.sock.recv(1, MSG_DONTWAIT|MSG_PEEK)):
self.__conn.close()
self.ep.close()
self.ep = None
postdata = json.dumps({'version': '1.1',
'method': service_name,
'params': args,
Expand All @@ -197,6 +216,9 @@ def _call(self, service_name, *args):
'User-Agent': DEFAULT_USER_AGENT,
'Authorization': self.__auth_header,
'Content-type': 'application/json'})
if EPOLL and not self.ep:
self.ep = select.epoll()
self.ep.register(self.__conn.sock, select.EPOLLIN|select.EPOLLHUP)

response = self._get_response()
if response['error'] is not None:
Expand All @@ -210,11 +232,21 @@ def _call(self, service_name, *args):

def _batch(self, rpc_call_list):
postdata = json.dumps(list(rpc_call_list))
if EPOLL and self.ep:
for (fd, ev) in self.ep.poll(0):
if ev & EPOLLHUP or (ev & EPOLLIN and \
b'' == self.__conn.sock.recv(1, MSG_DONTWAIT|MSG_PEEK)):
self.__conn.close()
self.ep.close()
self.ep = None
self.__conn.request('POST', self.__url.path, postdata,
{'Host': self.__url.hostname,
'User-Agent': DEFAULT_USER_AGENT,
'Authorization': self.__auth_header,
'Content-type': 'application/json'})
if EPOLL and not self.ep:
self.ep = select.epoll()
self.ep.register(self.__conn.sock, select.EPOLLIN|select.EPOLLHUP)

return self._get_response()

Expand Down