Changeset 131

Timestamp:

10/04/11 16:45:40 (13 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak config-loader to stop spitting errors if a config basename wasn't passed in.

File:

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

trunk/DNSDB.pm

@@ -139 +139 @@
 
   # System defaults
-  __cfgload("$configroot/dnsdb.conf") or $deferr = $errstr;
-
-  # Per-site-ish settings
-  unless (__cfgload("$configroot/$basename")) {
-    $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
+  __cfgload("$defconfig") or $deferr = $errstr;
+
+  # Per-site-ish settings.
+  if ($basename ne '.conf') {
+    unless (__cfgload("$siteconfig")) {
+      $errstr = ($deferr ? "Error opening default config file $defconfig: $deferr\n" : '').
         "Error opening site config file $siteconfig";
-    return;
+      return;
+    }
   }
 
@@ -160 +162 @@
   $errstr = '';
   my $cfgfile = shift;
+
   if (open CFG, "<$cfgfile") {
-#  my $mode = '';
     while (<CFG>) {
       chomp;