135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include last_defer timestamp when deferring a job

Browse Source
This commit is contained in:
Oliver Gorwits
2017-06-06 07:56:50 +01:00
parent 2ff39d131d
commit 275e01ff59
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/App/Netdisco/DB.pm
View File

@@ -11,7 +11,7 @@ __PACKAGE__->load_namespaces(
); );
our # try to hide from kwalitee our # try to hide from kwalitee
$VERSION = 42; # schema version used for upgrades, keep as integer $VERSION = 43; # schema version used for upgrades, keep as integer
use Path::Class; use Path::Class;
use File::ShareDir 'dist_dir'; use File::ShareDir 'dist_dir';

9
lib/App/Netdisco/DB/Result/DeviceSkip.pm
View File

@@ -14,9 +14,11 @@ __PACKAGE__->add_columns(
"device", "device",
{ data_type => "inet", is_nullable => 0 }, { data_type => "inet", is_nullable => 0 },
"actionset", "actionset",
{ data_type => "text[]", is_nullable => 0, default_value => '{}' }, { data_type => "text[]", is_nullable => 1, default_value => '{}' },
"deferrals", "deferrals",
{ data_type => "integer", is_nullable => 1, default_value => '0' }, { data_type => "integer", is_nullable => 1, default_value => '0' },
"last_defer",
{ data_type => "timestamp", is_nullable => 1 },
); );
__PACKAGE__->set_primary_key("backend", "device"); __PACKAGE__->set_primary_key("backend", "device");
@@ -36,7 +38,10 @@ There is a race in the update, but this is not worrying for now.
sub increment_deferrals { sub increment_deferrals {
my $row = shift; my $row = shift;
return unless $row->in_storage; return unless $row->in_storage;
return $row->update({ deferrals => (($row->deferrals || 0) + 1) }); return $row->update({
deferrals => (($row->deferrals || 0) + 1),
last_defer => \'now()',
});
} }
=head2 add_to_actionset =head2 add_to_actionset

5
share/schema_versions/App-Netdisco-DB-42-43-PostgreSQL.sql Normal file
View File

@@ -0,0 +1,5 @@
BEGIN;
ALTER TABLE "device_skip" ADD "last_defer" timestamp;
COMMIT;