Merge pull request #2 from Peatix/feature-worklog

feature:Add text logging on exitstatus.
Peatix · Jan 9, 2019 · b6e491a · b6e491a
2 parents 2526fad + e853722
commit b6e491a
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/doc/schema-postgres.sql b/doc/schema-postgres.sql
@@ -63,7 +63,8 @@ CREATE TABLE exitstatus (
         funcid          INT NOT NULL DEFAULT 0,
         status          SMALLINT,
         completion_time INTEGER,
-        delete_after    INTEGER
+        delete_after    INTEGER,
+        note            MEDIUMTEXT
 );
 
 CREATE INDEX exitstatus_funcid ON exitstatus (funcid);

diff --git a/doc/schema.sql b/doc/schema.sql
@@ -42,6 +42,7 @@ CREATE TABLE exitstatus (
         status          SMALLINT UNSIGNED,
         completion_time INTEGER UNSIGNED,
         delete_after    INTEGER UNSIGNED,
+        note            MEDIUMTEXT,
         INDEX (funcid),
         INDEX (delete_after)
 );
diff --git a/lib/TheSchwartz/ExitStatus.pm b/lib/TheSchwartz/ExitStatus.pm
@@ -7,7 +7,7 @@ use base qw( Data::ObjectDriver::BaseObject );
 __PACKAGE__->install_properties(
     {   columns => [
             qw( jobid status funcid
-                completion_time delete_after )
+                completion_time delete_after note )
         ],
         datasource  => 'exitstatus',
         primary_key => 'jobid',

diff --git a/lib/TheSchwartz/Job.pm b/lib/TheSchwartz/Job.pm
@@ -151,6 +151,7 @@ sub set_exit_status {
     $status->completion_time(time);
     $status->delete_after( $status->completion_time + $secs );
     $status->status($exit);
+    $status->note( join "\n", @{$job->{__note} || []} );
 
     my $driver = $job->driver;
     $driver->insert($status);
@@ -359,6 +360,12 @@ sub _cond_thaw {
     }
 }
 
+sub note {
+    my $job = shift;
+    my $note = $job->{__note} //= [];
+    push @$note, @_;
+}
+
 1;
 
 __END__

diff --git a/t/schema-sqlite.sql b/t/schema-sqlite.sql
@@ -29,5 +29,6 @@ CREATE TABLE exitstatus (
         funcid          INT UNSIGNED NOT NULL DEFAULT 0,
         status          SMALLINT UNSIGNED,
         completion_time INTEGER UNSIGNED,
-        delete_after    INTEGER UNSIGNED
+        delete_after    INTEGER UNSIGNED,
+        note            MEDIUMTEXT
 );