chiark / gitweb /
git-cache-proxy: Do not spuriously timeout on too many simultaneous invocations
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 26 Apr 2017 11:08:22 +0000 (12:08 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 26 Apr 2017 11:08:26 +0000 (12:08 +0100)
Specifically, do not timeout when reacquiring the lock before serving.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
debian/changelog
scripts/git-cache-proxy

index 0b673ab..2920e86 100644 (file)
@@ -1,6 +1,9 @@
 chiark-utils (5.0.1~) unstable; urgency=medium
 
   * with-lock-ex: provide -l
 chiark-utils (5.0.1~) unstable; urgency=medium
 
   * with-lock-ex: provide -l
+  * git-cache-proxy: Do not spuriously timeout on too many simultaneous
+    invocations (specifically, do not timeout when reacquiring the lock
+    before serving).
 
  --
 
 
  --
 
index 3e57a4f..e87a803 100755 (executable)
@@ -360,6 +360,7 @@ sub clonefetch () {
                servinfo "fetch/clone failed: $fetchfail";
            }
        }
                servinfo "fetch/clone failed: $fetchfail";
            }
        }
+        alarm 0;
 
        if (!$exists) {
            rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";
 
        if (!$exists) {
            rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";