Changeset 18353

Timestamp:

08/28/08 06:20:29 (4 months ago)

Author:

miyagawa

Message:

move the default value set in Job->new. Set run_after to the current time.

Location:

lang/perl/TheSchwartz-Simple/trunk/lib/TheSchwartz

Files:

• Simple.pm (modified) (1 diff)
• Simple/Job.pm (modified) (2 diffs)

lang/perl/TheSchwartz-Simple/trunk/lib/TheSchwartz/Simple.pm

@@ -30 +30 @@
     }
     $job->arg( Storable::nfreeze($job->arg) ) if ref $job->arg;
-
-    # Use default value if 'run_after' or 'grabbed_until' is not specified
-    $job->run_after( 0 ) unless $job->run_after;
-    $job->grabbed_until( 0 ) unless $job->grabbed_until;
 
     for my $dbh (@{$self->{databases}}) {

lang/perl/TheSchwartz-Simple/trunk/lib/TheSchwartz/Simple/Job.pm

@@ -4 +4 @@
 sub new_from_array {
     my($class, $funcname, $arg) = @_;
-    bless {
+    $class->new(
         funcname => $funcname,
         arg      => $arg,
-    }, $class;
+    );
 }
 
@@ -13 +13 @@
     my $class = shift;
     my %param = ref $_[0] ? %{$_[0]} : @_;
-    bless \%param, $class;
+    my $self = bless \%param, $class;
+
+    $self->run_after( time ) unless defined $self->run_after;
+    $self->grabbed_until( 0) unless defined $self->grabbed_until;
+
+    $self;
 }