more error handling

miyagawa · Apr 8, 2010 · 088d98a · 088d98a
1 parent 3638fb2
commit 088d98a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/Sunaba/Runner.pm b/lib/Sunaba/Runner.pm
@@ -34,8 +34,13 @@ sub to_app {
                     'X-Forwarded-For' => $env->{REMOTE_ADDR},
                 };
 
-                http_get $uri, headers => $hdrs, sub {
+                http_get $uri, headers => $hdrs, timeout => 3, sub {
                     my($body, $hdr) = @_;
+
+                    if ($hdr->{Status} =~ /^[45]/) {
+                        return $respond->([ 502, ["Content-Type", "text/plain"], [ "Bad gateway: $hdr->{Status}" ] ]);
+                    }
+
                     my $json = ($body =~ /^sunaba\((.*)\);$/s)[0];
                     if ($json) {
                         my $res = JSON::from_json($json);
@@ -44,7 +49,12 @@ sub to_app {
                         } elsif ($res->{error}) {
                             $respond->([ 500, [ "Content-Type", "text/plain" ], [ $res->{error} ] ]);
                         } else {
-                            $respond->(Storable::thaw(MIME::Base64::decode_base64($res->{stdout})));
+                            my $res = Storable::thaw(MIME::Base64::decode_base64($res->{stdout}));
+                            if (ref $res eq 'ARRAY') {
+                                $respond->($res);
+                            } else {
+                                $respond->([ 500, [ "Content-Type", "text/plain" ], [ "Bad response: $res" ] ]);
+                            }
                         }
                     }
                 };

diff --git a/lib/Sunaba/View.pm b/lib/Sunaba/View.pm
@@ -33,7 +33,7 @@ my $layout = sub {
                             a(href=>'http://bulknews.typepad.com/') { "Tatsuhiko Miyagawa" };
                             outs ". Sandbox perl environment is powered by ";
                             a(href=>'http://colabv6.dan.co.jp/lleval.html') { "Dan Kogai's lleval Ajax API" };
-                            outs " and all restrictions apply. Services can be interrupted, shutdown or blocked at any time at their own will. ";
+                            outs " and all of its restrictions apply. Services can be interrupted, shutdown or blocked at any time at their own will. ";
                             outs "NO WARRANTY. Use at your own risk.";
                         }
                     }