git-cache-proxy: Radically increase several timeouts.

Experience in the Xen Project Massachusetts test lab shows that these
are too low.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/debian/changelog b/debian/changelog
index c2dbeb9af8d97e6b663df6846203926b79b94d53..962c562f7a5f550e84181dfd5534c53462b25bea 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ chiark-utils (5.0.3~citrix2) unstable; urgency=medium
 
   git-cache-proxy:
   * New --serve-timeout option.
+  * Radically increase several timeouts.
 
   Copyright faff:
   * Add DEVELOPER-CERTIFICATE file and start using S-o-b practice.

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index ffdf6eab52fe57bad3b276ad71a21002abc5011e..52e01d0203b0e210200119cb42b57eea76ff7dbb 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -65,9 +65,9 @@ our $us = 'git-cache-proxy';
 our $debug = 0;
 our $housekeepingeverydays = 1;
 our $treeexpiredays = 21;
-our $fetchtimeout = 1800;
-our $maxfetchtimeout = 3600;
-our $servetimeout = 1000;
+our $fetchtimeout = 3600;
+our $maxfetchtimeout = 7200;
+our $servetimeout = 3600;
 our $cachedir = '/var/cache/git-cache-proxy';
 our $housekeepingonly = 0;