No Socketmap protocol in Spline::Srs

Better error handling.

1 files changed, 25 insertions, 2 deletions

diff --git a/Spline/Socketmap/Srs.pm b/Spline/Socketmap/Srs.pm
index c4a9623..785fd04 100644
--- a/Spline/Socketmap/Srs.pm
+++ b/Spline/Socketmap/Srs.pm
@@ -9,8 +9,31 @@ use Spline::Srs;
 sub lookup($$) {
     my $self = shift;
     my ($map, $key) = @_;
+    my $result;
 
-    $self->{srs}->handle($map, $key);
+    eval {
+        $result = $self->{srs}->handle($map, $key);
+    };
+
+    my $err = $@;
+    if ($err) {
+        if ($err =~ m/(Invalid hash|Invalid timestamp)/) {
+            $self->log(0, "Error: $err");
+            return "PERM $err";
+        }
+    }
+
+    if (defined $result) {
+        if ($result eq $key) {
+            $self->log(1, 'Not mapping "' . $key . '"');
+            return 'NOTFOUND ';
+        }
+
+        $self->log(1, 'Mapping "' . $key . '" to "' . $result . '"');
+        return "OK $result";
+    }
+
+    return 'NOTFOUND ';
 }
 
 sub options($$) {
@@ -70,7 +93,7 @@ sub post_configure_hook {
             close($file);
         }
         else {
-            $self->log(1, 'ERROR: Cannot open secret_file: "' . $filename . '"');
+            $self->log(0, 'ERROR: Cannot open secret_file: "' . $filename . '"');
         }
     }