X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=scripts%2Fgit-cache-proxy;h=647f6b60d3c152dae98a16240f0bf9181dcee86b;hp=8747eba9cbf788588a9514b601726d2905f9e5cf;hb=73537af44e3a2a2ae7d6eb1b11370b8354e4ef5c;hpb=0c9ee9d344314b4ef60810a5701f4905a579ad9f

diff --git a/scripts/git-cache-proxy b/scripts/git-cache-proxy
index 8747eba..647f6b6 100755
--- a/scripts/git-cache-proxy
+++ b/scripts/git-cache-proxy
@@ -29,7 +29,8 @@
 
 # git-cache-proxy
 # Copyright 2010 Tony Finch
-# Copyright 2013 Ian Jackson
+# Copyright 2013,2014 Ian Jackson
+# Copyright 2017 Citrix
 # 
 # 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 +361,7 @@ sub clonefetch () {
 		servinfo "fetch/clone failed: $fetchfail";
 	    }
 	}
+        alarm 0;
 
 	if (!$exists) {
 	    rename $tmpd, $gitd or fail "rename fresh $tmpd to $gitd: $!";
@@ -405,21 +407,28 @@ sub housekeeping () {
 	    next;
 	}
 	logm 'info', "housekeeping: subdirs $subdir: cleaning";
-	my $ok = 1;
-	foreach my $suffix (qw(tmp git)) {
-	    my $dir = "${subdir}\\.$suffix";
-	    my $errs;
-	    remove_tree($dir, { safe=>1, error=>\$errs });
-	    if (stat $dir) {
-		$ok = 0;
-		logm 'warning', "housekeeping: $dir: problems with".
-		    "deletion prevent cleanup:";
-		foreach my $err (@$errs) {
-		    logm 'info', "problem deleting: $err->[0]: $err->[1]";
+	eval {
+	    foreach my $suffix (qw(tmp git)) {
+		my $dir = "${subdir}\\.$suffix";
+		my $tdir = "${subdir}\\.tmp";
+		if ($dir ne $tdir) {
+		    if (!rename $dir,$tdir) {
+			next if $! == ENOENT;
+			die "$dir: cannot rename to $tdir: $!\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";
 		}
 	    }
-	}
-	if ($ok) {
+	};
+	if (length $@) {
+	    chomp $@;
+	    logm 'warning', "housekeeping: $subdir: cleanup prevented: $@";
+	} else {
 	    unlink $lock or hkfail "remove $lock: $!";
 	}
     }
@@ -449,8 +458,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;
 	}