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

should be die, not return, to abort txn_do

Browse Source
This commit is contained in:
Oliver Gorwits
2015-04-27 08:34:28 +01:00
parent e32814222a
commit 55acc3533f
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Netdisco/lib/App/Netdisco/Core/Discover.pm
View File

@@ -82,7 +82,7 @@ sub set_canonical_ip {
}
schema('netdisco')->txn_do(sub {
$device->renumber($new_ip) or return;
$device->renumber($new_ip) or die; # rollback
my $hostname = hostname_from_ip($device->ip);
$device->update({dns => $hostname});

9
Netdisco/lib/App/Netdisco/Util/Device.pm
View File

@@ -83,6 +83,10 @@ sub delete_device {
my $happy = 0;
schema('netdisco')->txn_do(sub {
# will delete everything related too...
schema('netdisco')->resultset('Device')
->search({ ip => $device->ip })->delete({archive_nodes => $archive});
schema('netdisco')->resultset('UserLog')->create({
username => session('logged_in_user'),
userip => scalar eval {request->remote_address},
@@ -90,9 +94,6 @@ sub delete_device {
details => $log,
});
# will delete everything related too...
schema('netdisco')->resultset('Device')
->search({ ip => $device->ip })->delete({archive_nodes => $archive});
$happy = 1;
});
@@ -116,7 +117,7 @@ sub renumber_device {
my $happy = 0;
schema('netdisco')->txn_do(sub {
$device->renumber($new_ip) or return;
$device->renumber($new_ip) or die; # rollback
schema('netdisco')->resultset('UserLog')->create({
username => session('logged_in_user'),