guard against race with *_or_* DBIC methods

2013-05-24 11:34:23 +01:00
parent d50c54972e
commit c74c56dc02
1 changed files with 6 additions and 2 deletions
--- a/Netdisco/lib/App/Netdisco/Util/Arpnip.pm
+++ b/Netdisco/lib/App/Netdisco/Util/Arpnip.pm
@@ -80,8 +80,12 @@ sub do_arpnip {

  # update subnets with new networks
  foreach my $cidr (@subnets) {
-      schema('netdisco')->resultset('Subnet')
-        ->update_or_create({net => $cidr, last_discover => \'now()'});
+      try {
+          schema('netdisco')->txn_do(sub {
+            schema('netdisco')->resultset('Subnet')
+              ->update_or_create({net => $cidr, last_discover => \'now()'});
+          });
+      };
  }
  debug sprintf ' [%s] arpnip - processed %s Subnet entries',
    $device->ip, scalar @subnets;