Changeset 63 for trunk

Timestamp:

01/20/10 17:36:39 (15 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak and normalize some existing but inconsistently-formatted logging

File:

• trunk/dns.cgi (modified) (5 diffs)

trunk/dns.cgi

@@ -259 +259 @@
   }
 
+  if ($webvar{del_failed}) {
+    $page->param(del_failed => 1);
+    $page->param(errmsg => $webvar{errmsg});
+  }
+
 } elsif ($webvar{page} eq 'record') {
 
@@ -286 +291 @@
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $webvar{parentid},
-                "Added default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Added default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
       } else {
         logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
-                "Added record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Added record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
       }
       changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec});
@@ -304 +309 @@
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $webvar{parentid},
-                "Failed adding default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
+                "Failed adding default record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl} ($msg)");
       } else {
         logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
-                "Failed adding record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl}");
+                "Failed adding record '$webvar{name} $typemap{$webvar{type}} $webvar{address}', TTL $webvar{ttl} ($msg)");
       }
     }
@@ -364 +369 @@
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $webvar{parentid},
-                "Failed updating default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Failed updating default record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl} ($msg)");
       } else {
         logaction($webvar{parentid}, $session->param("username"), parentID($webvar{parentid}, 'dom', 'group'),
-                "Failed updating record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl}");
+                "Failed updating record '$typemap{$webvar{type}} $webvar{name} $webvar{address}', TTL $webvar{ttl} ($msg)");
       }
     }
@@ -400 +405 @@
       if ($webvar{defrec} eq 'y') {
         logaction(0, $session->param("username"), $rec{parid},
-                "Failed deleting default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+                "Failed deleting default record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl} ($msg)");
       } else {
         logaction($rec{parid}, $session->param("username"), parentID($rec{parid}, 'dom', 'group'),
-                "Failed deleting record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl}");
+                "Failed deleting record '$rec{host} $typemap{$rec{type}} $rec{val}', TTL $rec{ttl} ($msg)");
       }
+changepage(page => "reclist", id => $webvar{parentid}, defrec => $webvar{defrec}, del_failed => 1, errmsg => $msg);
       $page->param(del_failed => 1);
       $page->param(errmsg => $msg);