From: Dirk Koopman <djk@tobit.co.uk>
Date: Fri, 13 Jan 2023 19:23:08 +0000 (+0000)
Subject: Allow route cache reading to continue if files missing
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=689155304c3c1bf0787ecea54a4043145d7aa2fe;p=spider.git

Allow route cache reading to continue if files missing
---

diff --git a/perl/Route/Node.pm b/perl/Route/Node.pm
index baa862ae..630db046 100644
--- a/perl/Route/Node.pm
+++ b/perl/Route/Node.pm
@@ -411,7 +411,7 @@ sub write_cache
 	    }
 	};
 	if (!$@ && @s) {
-		my $fh = IO::File->new(">$cachefn") or confess("writing $cachefn $!");
+		my $fh = IO::File->new(">$cachefn") or carp("writing $cachefn $!");
 		print $fh "$_" for (sort @s);
 		$fh->close;
 	} else {
@@ -431,14 +431,14 @@ sub read_cache
 	my $ta = [ gettimeofday ];
 	my $count;
 	
-	my $fh = IO::File->new("$cachefn") or confess("reading $cachefn $!");
+	my $fh = IO::File->new("$cachefn") or carp("reading $cachefn $!");
 	while (my $l = <$fh>) {
 		chomp $l;
 		my ($k, $v) = split /:/, $l, 2;
-		$list{$k} = bless $json->decode($v) or confess("json error decoding '$v'");
+		$list{$k} = bless $json->decode($v) or carp("json error decoding '$v'");
 		++$count;
 	}
-	$fh->close;
+	$fh->close if $fh;;
 
 	my $diff = _diffms($ta);
 	dbg("Route::Node::read_cache time to read $count records from $cachefn : $diff mS");
diff --git a/perl/Route/User.pm b/perl/Route/User.pm
index 3a6f4f32..d9d5249c 100644
--- a/perl/Route/User.pm
+++ b/perl/Route/User.pm
@@ -113,7 +113,7 @@ sub write_cache
 	    }
 	};
 	if (!$@ && @s) {
-		my $fh = IO::File->new(">$cachefn") or confess("writing $cachefn $!");
+		my $fh = IO::File->new(">$cachefn") or carp("writing $cachefn $!");
 		print $fh $_ for (sort @s);
 		$fh->close;
 	} else {
@@ -132,14 +132,14 @@ sub read_cache
 	my $ta = [ gettimeofday ];
 	my $count;
 	
-	my $fh = IO::File->new("$cachefn") or confess("reading $cachefn $!");
+	my $fh = IO::File->new("$cachefn") or carp("reading $cachefn $!");
 	while (my $l = <$fh>) {
 		chomp $l;
 		my ($k, $v) = split /:/, $l, 2;
-		$list{$k} = bless $json->decode($v) or confess("json error decoding '$v'");
+		$list{$k} = bless $json->decode($v) or carp("json error decoding '$v'");
 		++$count;
 	}
-	$fh->close;
+	$fh->close if $fh;
 
 	my $diff = _diffms($ta);
 	dbg("Route::User::read_cache time to read $count records from $cachefn : $diff mS");