From 01497549555c6a6cfba1002da74982fb58bcf5cf Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Thu, 24 May 2018 11:53:17 +0200
Subject: [PATCH] swh.indexer.api.client: Permit to specify the query timeout
option
Related T1061
---
debian/control | 6 +++---
requirements-swh.txt | 2 +-
swh/indexer/storage/api/client.py | 7 ++++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index 554619c9..6bd21ed6 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: debhelper (>= 9),
python3-pygments,
python3-magic,
python3-setuptools,
- python3-swh.core (>= 0.0.37~),
+ python3-swh.core (>= 0.0.40~),
python3-swh.model (>= 0.0.15~),
python3-swh.objstorage (>= 0.0.13~),
python3-swh.scheduler (>= 0.0.14~),
@@ -22,7 +22,7 @@ Homepage: https://forge.softwareheritage.org/diffusion/78/
Package: python3-swh.indexer.storage
Architecture: all
-Depends: python3-swh.core (>= 0.0.37~),
+Depends: python3-swh.core (>= 0.0.40~),
python3-swh.model (>= 0.0.15~),
python3-swh.objstorage (>= 0.0.13~),
python3-swh.scheduler (>= 0.0.14~),
@@ -34,7 +34,7 @@ Description: Software Heritage Content Indexer Storage
Package: python3-swh.indexer
Architecture: all
Depends: python3-swh.scheduler (>= 0.0.14~),
- python3-swh.core (>= 0.0.37~),
+ python3-swh.core (>= 0.0.40~),
python3-swh.model (>= 0.0.15~),
python3-swh.objstorage (>= 0.0.13~),
python3-swh.scheduler (>= 0.0.14~),
diff --git a/requirements-swh.txt b/requirements-swh.txt
index 4fc505de..264e313a 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,4 @@
-swh.core >= 0.0.37
+swh.core >= 0.0.40
swh.model >= 0.0.15
swh.objstorage >= 0.0.13
swh.scheduler >= 0.0.14
diff --git a/swh/indexer/storage/api/client.py b/swh/indexer/storage/api/client.py
index e6a87a99..25268bb8 100644
--- a/swh/indexer/storage/api/client.py
+++ b/swh/indexer/storage/api/client.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2017 The Software Heritage developers
+# Copyright (C) 2015-2018 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU General Public License version 3, or any later version
# See top-level LICENSE file for more information
@@ -11,8 +11,9 @@ from swh.storage.exc import StorageAPIError
class RemoteStorage(SWHRemoteAPI):
"""Proxy to a remote storage API"""
- def __init__(self, url):
- super().__init__(api_exception=StorageAPIError, url=url)
+ def __init__(self, url, timeout=None):
+ super().__init__(
+ api_exception=StorageAPIError, url=url, timeout=timeout)
def check_config(self, *, check_write):
return self.post('check_config', {'check_write': check_write})
--
GitLab