From d1dc0cde9b385b88ebd3449879f54f9ad9c0c806 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <antoine.romain.dumont@gmail.com>
Date: Thu, 24 May 2018 11:36:16 +0200
Subject: [PATCH] swh.web.config: Set default timeout for indexer-storage &
storage
Related T1061
---
debian/control | 16 ++++++++--------
requirements-swh.txt | 8 ++++----
swh/web/config.py | 2 ++
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/debian/control b/debian/control
index 40349ab27..a9a394deb 100644
--- a/debian/control
+++ b/debian/control
@@ -21,21 +21,21 @@ Build-Depends: curl,
python3-sphinx,
python3-sphinxcontrib.httpdomain,
python3-yaml,
- python3-swh.core (>= 0.0.20~),
+ python3-swh.core (>= 0.0.40~),
python3-swh.model (>= 0.0.15~),
- python3-swh.storage (>= 0.0.95~),
- python3-swh.indexer.storage (>= 0.0.46~),
- python3-swh.vault (>= 0.0.1~)
+ python3-swh.storage (>= 0.0.101~),
+ python3-swh.indexer.storage (>= 0.0.47~),
+ python3-swh.vault (>= 0.0.2~)
Standards-Version: 3.9.6
Homepage: https://forge.softwareheritage.org/diffusion/DWUI/
Package: python3-swh.web
Architecture: all
-Depends: python3-swh.core (>= 0.0.20~),
+Depends: python3-swh.core (>= 0.0.40~),
python3-swh.model (>= 0.0.15~),
- python3-swh.storage (>= 0.0.95~),
- python3-swh.indexer.storage (>= 0.0.46~),
- python3-swh.vault (>= 0.0.1~),
+ python3-swh.storage (>= 0.0.101~),
+ python3-swh.indexer.storage (>= 0.0.47~),
+ python3-swh.vault (>= 0.0.2~),
${misc:Depends},
${python3:Depends}
Description: Software Heritage Web Applications
diff --git a/requirements-swh.txt b/requirements-swh.txt
index ce4f053c8..64a680926 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,5 +1,5 @@
-swh.core >= 0.0.20
+swh.core >= 0.0.40
swh.model >= 0.0.15
-swh.storage >= 0.0.96
-swh.vault >= 0.0.1
-swh.indexer.storage >= 0.0.46
+swh.storage >= 0.0.101
+swh.vault >= 0.0.2
+swh.indexer.storage >= 0.0.47
diff --git a/swh/web/config.py b/swh/web/config.py
index c00133020..dcf5a06d2 100644
--- a/swh/web/config.py
+++ b/swh/web/config.py
@@ -15,12 +15,14 @@ DEFAULT_CONFIG = {
'cls': 'remote',
'args': {
'url': 'http://127.0.0.1:5002/',
+ 'timeout': 10,
},
}),
'indexer_storage': ('dict', {
'cls': 'remote',
'args': {
'url': 'http://127.0.0.1:5007/',
+ 'timeout': 1,
}
}),
'vault': ('string', 'http://127.0.0.1:5005/'),
--
GitLab