Changeset 424

Timestamp:

03/21/08 18:15:02 (8 months ago)

Author:

eevee

Message:

Removed timed_exec in favor of the Time::Out module. (#289)

Location:

veekun/trunk

Files:

• README.pod (modified) (1 diff)
• lib/Vee.pm (modified) (3 diffs)
• lib/Vee/Controller/Root.pm (modified) (4 diffs)
• lib/Vee/Utils.pm (modified) (1 diff)

veekun/trunk/README.pod

@@ -39 +39 @@
     String::Approx
     Template
+    Time::Out
     XML::Feed
     YAML

veekun/trunk/lib/Vee.pm

@@ -5 +5 @@
 use strict;
 use warnings;
+
+use Image::Size;
+use LWP::UserAgent;
+use Time::Out qw/timeout/;
+use YAML qw//;
 
 # load crap
@@ -28 +33 @@
 use Vee::Utils;
 use Vee::Dex;
-use YAML qw//;
-use LWP::UserAgent;
-use Image::Size;
 
 our $VERSION = '0.01';
@@ -56 +58 @@
 
 # grab the current revision number, if applicable
-__PACKAGE__->cache->{svn_revision} =
-    Vee::Utils::timed_exec( 5 => sub {
-        open my $fh, '-|', 'svnversion' or return;
-        my $revision = <$fh>;
-        close $fh;
-        $revision =~ s/ \D+ $//gx;
-        return $revision;
-    } )
-    unless __PACKAGE__->debug;
+__PACKAGE__->cache->{svn_revision} = timeout 5, sub {
+warn "begin sub";
+    open my $fh, '-|', 'svnversion' or return;
+    my $revision = <$fh>;
+    close $fh;
+    $revision =~ s/ \D+ $//gx;
+    return $revision;
+warn "end sub";
+};
 
 {

veekun/trunk/lib/Vee/Controller/Root.pm

@@ -4 +4 @@
 use warnings;
 use base 'Catalyst::Controller';
+
+use Vee::Authorization;
+use Vee::Utils;
 
 use Data::Dumper;
@@ -9 +12 @@
 use File::Path;
 use Time::HiRes;
+use Time::Out qw/timeout/;
 use URI;
 use XML::Feed;
-
-use Vee::Authorization;
-use Vee::Utils;
 
 # Sets the actions in this controller to be registered with no prefix
@@ -285 +286 @@
     # Refresh Bulbapedia feeds
 eval {
-    Vee::Utils::timed_exec( 5 => sub {
+    timeout 5, sub {
+warn "begin sub";
         my $uri = URI->new($c->site_opts->{rss_url});
         my @entries = XML::Feed->parse($uri)->entries;
@@ -291 +293 @@
             @entries[ 0 .. $c->site_opts->{page_sizes}{index}{rss} - 1 ];
         $c->cache->{rss_entries} = \@entries;
-    } );
+warn "end sub";
+    };
 };
 

veekun/trunk/lib/Vee/Utils.pm

@@ -89 +89 @@
 }
 
-# execute code but give up after x seconds
-# this is taken from perldoc -f alarm
-sub timed_exec {
-    my ($secs, $subref) = @_;
-    my $res = eval {
-        local $SIG{ALRM} = sub { die "alarm\n" };
-        alarm $secs;
-        my $res = $subref->();
-        alarm 0;
-        return $res;
-    };
-
-    if ($@) {
-        die unless $@ eq "alarm\n";  # propagate unexpected errors
-        return;
-    } else {
-        return $res;
-    }
-}
-
 # URL-validation regex
 # Inferred from the W3's BNF: http://www.w3.org/Addressing/URL/5_BNF.html