git-cache-proxy: Do not spuriously timeout on too many simultaneous invocations

[chiark-utils.git] / scripts / git-cache-proxy

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 2f38de1154be164d316d7fb06579a22841d521c1..e87a80329e313663515e8d23f96c8083335ca1d1 100755 (executable)
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -29,7 +29,7 @@
 
 # git-cache-proxy
 # Copyright 2010 Tony Finch
-# Copyright 2013 Ian Jackson
+# Copyright 2013,2014 Ian Jackson
 # 
 # git-cache-proxy is free software; you can redistribute it and/or
 # modify them under the terms of the GNU General Public License as
@@ -360,6 +360,7 @@ sub clonefetch () {
                servinfo "fetch/clone failed: $fetchfail";
            }
        }
+        alarm 0;
 
        if (!$exists) {
            rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";
@@ -408,14 +409,18 @@ sub housekeeping () {
        eval {
            foreach my $suffix (qw(tmp git)) {
                my $dir = "${subdir}\\.$suffix";
-               my $errs;
-               remove_tree($dir, { safe=>1, error=>\$errs });
-               if (stat $dir) {
-                   foreach my $err (@$errs) {
-                       my ($file, $message) = %$err;
-                       logm 'info', "problem deleting: $file: $message";
+               my $tdir = "${subdir}\\.tmp";
+               if ($dir ne $tdir) {
+                   if (!rename $dir,$tdir) {
+                       next if $! == ENOENT;
+                       die "$dir: cannot rename to $tdir: $!\n";
                    }
-                   die "$dir: problem deleting file(s)\n";
+               }
+               system qw(rm -rf --), $tdir;
+               if (stat $tdir) {
+                   die "$dir: problem deleting file(s), rm exited $?\n";
+               } elsif ($! != ENOENT) {
+                   die "$tdir: cannot stat after deletion: $!\n";
                }
            }
        };
@@ -452,8 +457,10 @@ sub housekeepingcheck ($$) {
     }
     if ($dofork) {
        my $child = fork;
-       defined $child or hkfail "fork: $!";
+       defined $child or fail "fork: $!";
        if (!$child) {
+           open STDERR, "|logger -p daemon.warning -t '$us(housekeeping)'"
+               or die "fork: logger $!";
            housekeeping();
            exit 0;
        }