Changeset 851 for trunk/cgi-bin/ipdb-rpc.cgi

Timestamp:

04/13/16 18:16:46 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Update syslog and mailNotify() calls to better match the new data
structures, and normalize their formatting

File:

• trunk/cgi-bin/ipdb-rpc.cgi (modified) (2 diffs)

trunk/cgi-bin/ipdb-rpc.cgi

@@ -267 +267 @@
     die "Pool ID or VRF is required\n" if !$args{parent} && !$args{vrf};
     ($args{block}) = $ip_dbh->selectrow_array(
-       "SELECT id FROM poolips WHERE ip = ? AND ".($args{parent} ? "parent_id = ?" : "vrf = ?"),
-       undef, $args{block}, ($args{parent} ? $args{parent} : $args{vrf}) );
+        "SELECT id FROM poolips WHERE ip = ? AND ".($args{parent} ? "parent_id = ?" : "vrf = ?"),
+        undef, $args{block}, ($args{parent} ? $args{parent} : $args{vrf}) );
   }
 
@@ -275 +275 @@
   # set assignIP_on_update to simplify some calling situations.  better to use allocateBlock if possible though.
   my ($code,$msg) = updateBlock($ip_dbh, %args, assignIP_on_update => 1);
-
   if ($code eq 'FAIL') {
-    syslog "err", "$args{rpcsystem}/$args{rpcuser} could not update block/IP ID $args{block}: '$msg'";
+    syslog "err", "$args{rpcsystem}/$args{rpcuser} could not update block/IP $args{block} ($binfo->{block}): '$msg'";
     die "$msg\n";
   }
-
-  syslog "notice", "$authuser updated $args{block}";
+  syslog "notice", "$args{rpcsystem}/$args{rpcuser} updated $args{block} ($binfo->{block})";
 
   return $msg;
-
 } # rpc_updateBlock()