Changeset 195 for trunk/DNSDB.pm

Timestamp:

12/12/11 17:52:55 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

More log behaviour tweaking

• fix broken detail-logging of MX/SRV records on record add
• add flag to control failure logging
• fix broken user fullname grabber in _log

Tweak config loading with a few new options

File:

• trunk/DNSDB.pm (modified) (6 diffs)

trunk/DNSDB.pm

@@ -98 +98 @@
 
 # Prepopulate a basic config.  Note some of these *will* cause errors if left unset.
+# note:  add appropriate stanzas in loadConfig to parse these
 our %config = (
                 # Database connection info
@@ -107 +108 @@
                 # Email notice settings
                 mailhost        => 'smtp.example.com',
-                mailsender      => 'dnsdb@example.com',
+                mailnotify      => 'dnsdb@example.com', # to
+                mailsender      => 'dnsdb@example.com', # from
                 mailname        => 'DNS Administration',
+                orgname         => 'Example Corp',
+                domain          => 'example.com',
 
                 # Template directory
@@ -116 +120 @@
 
                 # Session params
-                timeout         => '3600'       # 1 hour default
+                timeout         => '3600',      # 1 hour default
+
+                # Other miscellanea
+                log_failures    => 1,   # log all evarthing by default
         );
 
@@ -150 +157 @@
         "Error opening site config file $siteconfig";
       return;
+    }
+  }
+
+  # Munge log_failures.
+  if ($config{log_failures} ne '1' && $config{log_failures} ne '0') {
+    # true/false, on/off, yes/no all valid.
+    if ($config{log_failures} =~ /^(?:true|false|on|off|yes|no)$/) {
+      if ($config{log_failures} =~ /(?:true|on|yes)/) {
+        $config{log_failures} = 1;
+      } else {
+        $config{log_failures} = 0;
+      }
+    } else {
+      $errstr = "Bad log_failures setting $config{log_failures}";
+      $config{log_failures} = 1;
+      # Bad setting shouldn't be fatal.
+      # return 2;
     }
   }
@@ -190 +214 @@
       # Mail settings
       $config{mailhost}         = $1 if /^mailhost\s*=\s*([a-z0-9_.-]+)/i;
+      $config{mailnotify}       = $1 if /^mailnotify\s*=\s*([a-z0-9_.@-]+)/i;
       $config{mailsender}       = $1 if /^mailsender\s*=\s*([a-z0-9_.@-]+)/i;
       $config{mailname}         = $1 if /^mailname\s*=\s*([a-z0-9\s_.-]+)/i;
+      $config{orgname}          = $1 if /^orgname\s*=\s*([a-z0-9\s_.,'-]+)/i;
+      $config{domain}           = $1 if /^domain\s*=\s*([a-z0-9_.-]+)/i;
       # session - note this is fed directly to CGI::Session
       $config{timeout}  = $1 if /^[tT][iI][mM][eE][oO][uU][tT]\s*=\s*(\d+[smhdwMy]?)/;
+      # log failed actions
+      $config{log_failures}     = $1 if /^log_failures\s*=\s*([a-z01]+)/i;
     }
     close CFG;
@@ -496 +525 @@
 ##fixme:  need better way(s?) to snag userinfo for log entries.  don't want to have
 # to pass around yet *another* constant (already passing $dbh, shouldn't need to)
+  my $fullname;
   if (!$user_id) {
-    $user_id, $fullname) = $dbh->fetchrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
+    ($user_id, $fullname) = $dbh->selectrow_array("SELECT user_id, firstname || ' ' || lastname FROM users".
         " WHERE username=?", undef, ($username));
   } elsif (!$username) {
-    $username, $fullname) = $dbh->fetchrow_array("SELECT username, firstname || ' ' || lastname FROM users".
+    ($username, $fullname) = $dbh->selectrow_array("SELECT username, firstname || ' ' || lastname FROM users".
+        " WHERE user_id=?", undef, ($user_id));
+  } else {
+    ($fullname) = $dbh->selectrow_array("SELECT firstname || ' ' || lastname FROM users".
         " WHERE user_id=?", undef, ($user_id));
   }