Skip to content

Commit

Permalink
Merge branch 'main' into task/DES-2623--pydantic-schemas-for-entities
Browse files Browse the repository at this point in the history
  • Loading branch information
jarosenb authored Dec 11, 2023
2 parents 489bdca + fdd85c6 commit a07fc34
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion designsafe/apps/data/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class KeepAliveConnection(Urllib3HttpConnection):
"""
def __init__(self, *args, **kwargs):
super(KeepAliveConnection, self).__init__(*args, **kwargs)
if not (settings.DEBUG or settings.TEST):
if not (settings.DEBUG or getattr(settings, "TEST", False)):
self.pool.conn_kw['socket_options'] = HTTPConnection.default_socket_options + [
(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1),
(socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 60),
Expand Down

0 comments on commit a07fc34

Please sign in to comment.