Changeset 851 for trunk

Timestamp:

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

Author:

Kris Deugau

Message:

/trunk

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

Location:

trunk/cgi-bin

Files:

• ipdb-rpc.cgi (modified) (2 diffs)
• main.cgi (modified) (3 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()
 

trunk/cgi-bin/main.cgi

@@ -1317 +1317 @@
 
   if ($code eq 'FAIL') {
-    syslog "err", "$authuser could not update block/IP '$binfo->{block}' (id $webvar{block}): '$msg'";
+    syslog "err", "$authuser could not update block/IP $webvar{block} ($binfo->{block}): '$msg'";
     $page->param(err => "Could not update block/IP $binfo->{block}: $msg");
     return;
@@ -1323 +1323 @@
 
   # If we get here, the operation succeeded.
-  syslog "notice", "$authuser updated $binfo->{block}";
+  syslog "notice", "$authuser updated $webvar{block} ($binfo->{block})";
 ##fixme:  log details of the change?  old way is in the .debug stream anyway.
 ##fixme:  need to wedge something in to allow "update:field" notifications
@@ -1725 +1725 @@
   }
   if ($code eq 'OK' || $code =~ /^WARN/) {
-    syslog "notice", "$authuser deallocated '".$blockinfo->{type}."'-type netblock $webvar{block} ".
-        $blockinfo->{custid}.", ".$blockinfo->{city}.", desc='".$blockinfo->{description}."'";
-    mailNotify($ip_dbh, 'da', "REMOVED: ".$disp_alloctypes{$blockinfo->{type}}." $webvar{block}",
-        $disp_alloctypes{$blockinfo->{type}}." $webvar{block} deallocated by $authuser\n".
-        "CustID: ".$blockinfo->{custid}."\nCity: ".$blockinfo->{city}.
-        "\nDescription: ".$blockinfo->{description}."\n");
+    syslog "notice", "$authuser deallocated '".$blockinfo->{type}."'-type netblock ID $webvar{block} ".
+        "($blockinfo->{block}), $blockinfo->{custid}, $blockinfo->{city}, desc='$blockinfo->{description}'";
+    mailNotify($ip_dbh, 'da', "REMOVED: $disp_alloctypes{$blockinfo->{type}} $blockinfo->{block}",
+# $webvar{block} useful?  do we care about the block ID here?
+        "$disp_alloctypes{$blockinfo->{type}} $blockinfo->{block} deallocated by $authuser\n".
+        "CustID: $blockinfo->{custid}\nCity: $blockinfo->{city}\n".
+        "Description: $blockinfo->{description}\n");
   } else {
     $page->param(failmsg => $msg);
     if ($webvar{alloctype} =~ /^.i$/) {
-      syslog "err", "$authuser could not deallocate static IP '$webvar{block}': '$msg'";
+      syslog "err", "$authuser could not deallocate static IP $webvar{block} ($blockinfo->{block}): '$msg'";
     } else {
-      syslog "err", "$authuser could not deallocate netblock '$webvar{block}': '$msg'";
+      syslog "err", "$authuser could not deallocate netblock $webvar{block} ($blockinfo->{block}): '$msg'";
       $page->param(netblock => 1);
     }