Skip to content

Add retry on EINTR. #291

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

Closed
rgbyrnes wants to merge 1 commit into from
Closed

Add retry on EINTR. #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion Lib/ldap/ldapobject.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@

from ldap import LDAPError

from errno import EINTR

def _retry_if_interrupted(func, *args, **kwargs):
"""Call func, retrying if it raises an LDAPError with errno == EINTR.
"""

while True:
try:
return func(*args, **kwargs)
except LDAPError as e:
try:
if e.args[0]['errno'] != EINTR:
raise
except (AttributeError, IndexError, KeyError):
raise e

PY2 = sys.version_info[0] <= 2
if PY2:
text_type = unicode
Expand Down Expand Up @@ -312,7 +328,7 @@ def _ldap_call(self,func,*args,**kwargs):
diagnostic_message_success = None
try:
try:
result = func(*args,**kwargs)
result = _retry_if_interrupted(func, *args, **kwargs)
if __debug__ and self._trace_level>=2:
if func.__name__!="unbind_ext":
diagnostic_message_success = self._l.get_option(ldap.OPT_DIAGNOSTIC_MESSAGE)
Expand Down