Changeset 586

Timestamp:

Oct 4, 2007, 7:08:10 PM (13 years ago)

Author:

Nick Burch

Message:

Handle the database going away better

File:

• trunk/npemap.org.uk/cgi/geocoder.fcgi (modified) (3 diffs)

trunk/npemap.org.uk/cgi/geocoder.fcgi

@@ -141 +141 @@
                 my ($easting,$northing,$matched,$pc);
                 my ($outward,$inward) = ($request{outward},$request{inward});
+                sleep 5;
 
                 # Work out until we find a match
                 ($easting,$northing,$matched,$pc) = execute_ptl($full_matcher,$outward,$inward);
+
+                # Ensure the search worked, and the db isn't broken
+                unless(defined $easting) {
+                        warn("Search failed to execute, is the database server down?");
+                        ($full_matcher,$postcode_matcher,$pc_area_matcher) = (undef,undef,undef);
+                        print_internal_err('Error setting up database connection');
+                        next REQUEST;
+                }
+
+                # Keep looking for a match
                 unless($matched) {
                         ($easting,$northing,$matched,$pc) = 
@@ -260 +271 @@
         my ($easting,$northing,$matched,$pc);
 
-        $matcher->execute(@args);
+        my $res = $matcher->execute(@args);
+        # Should have got something back, unless it's broken
+        unless(defined $res) {
+                warn("Nothing received from execute, is the connection open?");
+                return undef;
+        }
+
         while( my @row = $matcher->fetchrow_array ) {
                 ($easting,$northing,$matched,$pc) = @row;
@@ -275 +292 @@
         my @results;
 
-        $matcher->execute(@args);
+        my $res = $matcher->execute(@args);
+        # Should have got something back, unless it's broken
+        unless(defined $res) {
+                warn("Nothing received from execute, is the connection open?");
+                return undef;
+        }
+
         while( my @row = $matcher->fetchrow_array ) {
                 my %res = (