Changeset 487


Ignore:
Timestamp:
03/15/13 12:45:23 (12 years ago)
Author:
Kris Deugau
Message:

/trunk

Object conversion of DNSDB.pm, part 19. See #11.

  • internal calls to _log()
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/DNSDB.pm

    r485 r487  
    6363        );
    6464
    65 @EXPORT         = (); # Export nothing by default.
     65@EXPORT         = qw(%typemap %reverse_typemap %permissions @permtypes $permlist %permchains);
    6666%EXPORT_TAGS    = ( ALL => [qw(
    6767                &initGlobals &login &initActionLog
    … …  
    16971697      $resultmsg = "Updated default permissions for group $name";
    16981698    }
    1699     _log($dbh, (group_id => ($type eq 'user' ? $parid : $id), entry => $resultmsg));
     1699    $self->_log(group_id => ($type eq 'user' ? $parid : $id), entry => $resultmsg);
    17001700    $dbh->commit;
    17011701  }; # end eval
    … …  
    17871787    $dbh->do("UPDATE $par_tbl{$type} SET group_id=? WHERE $id_col{$type}=?", undef, ($newgrp, $id));
    17881788    # Log the change in both the old and new groups
    1789     _log($dbh, (group_id => $oldgid, entry => "Moved $type $entname from $oldgname to $newgname"));
    1790     _log($dbh, (group_id => $newgrp, entry => "Moved $type $entname from $oldgname to $newgname"));
     1789    $self->_log(group_id => $oldgid, entry => "Moved $type $entname from $oldgname to $newgname");
     1790    $self->_log(group_id => $newgrp, entry => "Moved $type $entname from $oldgname to $newgname");
    17911791    $dbh->commit;
    17921792  };
    … …  
    17951795    eval { $dbh->rollback; };
    17961796    if ($config{log_failures}) {
    1797       _log($dbh, (group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg"));
     1797      $self->_log(group_id => $oldgid, entry => "Error moving $type $entname to $newgname: $msg");
    17981798      $dbh->commit;     # since we enabled transactions earlier
    17991799    }
    … …  
    18581858        undef, ($domain));
    18591859
    1860     _log($dbh, (domain_id => $dom_id, group_id => $group,
    1861         entry => "Added ".($state ? 'active' : 'inactive')." domain $domain"));
     1860    $self->_log(domain_id => $dom_id, group_id => $group,
     1861        entry => "Added ".($state ? 'active' : 'inactive')." domain $domain");
    18621862
    18631863    # ... and now we construct the standard records from the default set.  NB:  group should be variable.
    … …  
    18731873        my @tmp1 = split /:/, $host;
    18741874        my @tmp2 = split /:/, $val;
    1875         _log($dbh, (domain_id => $dom_id, group_id => $group,
     1875        $self->_log(domain_id => $dom_id, group_id => $group,
    18761876                entry => "[new $domain] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
    1877                 "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
     1877                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl");
    18781878      } else {
    18791879        my $logentry = "[new $domain] Added record '$host $typemap{$type}";
    18801880        $logentry .= " [distance $dist]" if $typemap{$type} eq 'MX';
    18811881        $logentry .= " [priority $dist] [weight $weight] [port $port]" if $typemap{$type} eq 'SRV';
    1882         _log($dbh, (domain_id => $dom_id, group_id => $group,
    1883                 entry => $logentry." $val', TTL $ttl"));
     1882        $self->_log(domain_id => $dom_id, group_id => $group,
     1883                entry => $logentry." $val', TTL $ttl");
    18841884      }
    18851885    }
    … …  
    18921892    my $msg = $@;
    18931893    eval { $dbh->rollback; };
    1894     _log($dbh, (group_id => $group, entry => "Failed adding domain $domain ($msg)"))
     1894    $self->_log(group_id => $group, entry => "Failed adding domain $domain ($msg)")
    18951895        if $config{log_failures};
    18961896    $dbh->commit;       # since we enabled transactions earlier
    … …  
    19621962    $msg = "Deleted ".($revrec eq 'n' ? 'domain' : 'reverse zone')." $zone";
    19631963    $loghash{entry} = $msg;
    1964     _log($dbh, %loghash);
     1964    $self->_log(%loghash);
    19651965
    19661966    # once we get here, we should have suceeded.
    … …  
    19731973    $loghash{entry} = "Error deleting $zone: $msg ($failmsg)";
    19741974    if ($config{log_failures}) {
    1975       _log($dbh, %loghash);
     1975      $self->_log(%loghash);
    19761976      $dbh->commit;     # since we enabled transactions earlier
    19771977    }
    … …  
    20892089    ($rdns_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
    20902090
    2091     _log($dbh, (rdns_id => $rdns_id, group_id => $group,
    2092         entry => "Added ".($state ? 'active' : 'inactive')." reverse zone $zone"));
     2091    $self->_log(rdns_id => $rdns_id, group_id => $group,
     2092        entry => "Added ".($state ? 'active' : 'inactive')." reverse zone $zone");
    20932093
    20942094    # ... and now we construct the standard records from the default set.  NB:  group should be variable.
    … …  
    21542154        my @tmp1 = split /:/, $host;
    21552155        my @tmp2 = split /:/, $val;
    2156         _log($dbh, (rdns_id => $rdns_id, group_id => $group,
     2156        $self->_log(rdns_id => $rdns_id, group_id => $group,
    21572157                entry => "[new $zone] Added SOA record [contact $tmp1[0]] [master $tmp1[1]] ".
    2158                 "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl"));
     2158                "[refresh $tmp2[0]] [retry $tmp2[1]] [expire $tmp2[2]] [minttl $tmp2[3]], TTL $ttl");
    21592159        $defttl = $tmp2[3];
    21602160      } else {
    21612161        my $logentry = "[new $zone] Added record '$host $typemap{$type} $val', TTL $ttl";
    21622162        $logentry .= ", default location ".$self->getLoc($defloc)->{description} if $defloc;
    2163         _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group, entry => $logentry) );
     2163        $self->_log(rdns_id => $rdns_id, domain_id => $domid, group_id => $group, entry => $logentry);
    21642164      }
    21652165    }
    … …  
    21832183      $sth_in->execute($domid,$host,$type,$val,$defttl,$defloc);
    21842184      my $logentry = "[new $zone] Added record '$host $typemap{$type}";
    2185       _log($dbh, (rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
    2186         entry => $logentry." $val', TTL $defttl from pattern"));
     2185      $self->_log(rdns_id => $rdns_id, domain_id => $domid, group_id => $group,
     2186        entry => $logentry." $val', TTL $defttl from pattern");
    21872187    }
    21882188
    21892189    # If there are warnings (presumably about default records skipped for cause) log them
    2190     _log($dbh, (rdns_id => $rdns_id, group_id => $group, entry => "Warning(s) adding $zone:$warnstr"))
     2190    $self->_log(rdns_id => $rdns_id, group_id => $group, entry => "Warning(s) adding $zone:$warnstr")
    21912191        if $warnstr;
    21922192
    … …  
    21982198    my $msg = $@;
    21992199    eval { $dbh->rollback; };
    2200     _log($dbh, (group_id => $group, entry => "Failed adding reverse zone $zone ($msg)"))
     2200    $self->_log(group_id => $group, entry => "Failed adding reverse zone $zone ($msg)")
    22012201        if $config{log_failures};
    22022202    $dbh->commit;       # since we enabled transactions earlier
    … …  
    24112411    }
    24122412
    2413     _log($dbh, (group_id => $pargroup, entry => "Added group $groupname") );
     2413    $self->_log(group_id => $pargroup, entry => "Added group $groupname");
    24142414
    24152415    # once we get here, we should have suceeded.
    … …  
    24212421    eval { $dbh->rollback; };
    24222422    if ($config{log_failures}) {
    2423       _log($dbh, (group_id => $pargroup, entry => "Failed to add group $groupname: $msg") );
     2423      $self->_log(group_id => $pargroup, entry => "Failed to add group $groupname: $msg");
    24242424      $dbh->commit;
    24252425    }
    … …  
    24742474    $dbh->do("DELETE from groups WHERE group_id=?", undef, ($groupid));
    24752475
    2476     _log($dbh, (group_id => $parid, entry => "Deleted group $groupname"));
     2476    $self->_log(group_id => $parid, entry => "Deleted group $groupname");
    24772477    $resultmsg = "Deleted group $groupname";
    24782478
    … …  
    24852485    eval { $dbh->rollback; };
    24862486    if ($config{log_failures}) {
    2487       _log($dbh, (group_id => $parid, entry => "$failmsg: $msg"));
     2487      $self->_log(group_id => $parid, entry => "$failmsg: $msg");
    24882488      $dbh->commit;     # since we enabled transactions earlier
    24892489    }
    … …  
    27572757##fixme: add another table to hold name/email for log table?
    27582758
    2759     _log($dbh, (group_id => $group, entry => "Added user $username ($fname $lname)"));
     2759    $self->_log(group_id => $group, entry => "Added user $username ($fname $lname)");
    27602760    # once we get here, we should have suceeded.
    27612761    $dbh->commit;
    … …  
    27662766    eval { $dbh->rollback; };
    27672767    if ($config{log_failures}) {
    2768       _log($dbh, (group_id => $group, entry => "Error adding user $username: $msg"));
     2768      $self->_log(group_id => $group, entry => "Error adding user $username: $msg");
    27692769      $dbh->commit;     # since we enabled transactions earlier
    27702770    }
    … …  
    29182918        " WHERE user_id=?", undef, ($username, $pass, $fname, $lname, $phone, $type, $state, $uid));
    29192919    $resultmsg = "Updated user info for $username ($fname $lname)";
    2920     _log($dbh, group_id => $group, entry => $resultmsg);
     2920    $self->_log(group_id => $group, entry => $resultmsg);
    29212921    $dbh->commit;
    29222922  };
    … …  
    29252925    eval { $dbh->rollback; };
    29262926    if ($config{log_failures}) {
    2927       _log($dbh, (group_id => $group, entry => "Error updating user $username: $msg"));
     2927      $self->_log(group_id => $group, entry => "Error updating user $username: $msg");
    29282928      $dbh->commit;     # since we enabled transactions earlier
    29292929    }
    … …  
    29552955  eval {
    29562956    $dbh->do("DELETE FROM users WHERE user_id=?", undef, ($userid));
    2957     _log($dbh, (group_id => $userdata->{group_id},
     2957    $self->_log(group_id => $userdata->{group_id},
    29582958        entry => "Deleted user ID $userid/".$userdata->{username}.
    2959                 " (".$userdata->{firstname}." ".$userdata->{lastname}.")") );
     2959                " (".$userdata->{firstname}." ".$userdata->{lastname}.")");
    29602960    $dbh->commit;
    29612961  };
    … …  
    29642964    eval { $dbh->rollback; };
    29652965    if ($config{log_failures}) {
    2966       _log($dbh, (group_id => $userdata->{group_id}, entry => "Error deleting user ID ".
    2967         "$userid/".$userdata->{username}.": $msg") );
     2966      $self->_log(group_id => $userdata->{group_id}, entry => "Error deleting user ID ".
     2967        "$userid/".$userdata->{username}.": $msg");
    29682968      $dbh->commit;
    29692969    }
    … …  
    30343034      $loghash{group_id} = $self->parentID(id => $id, type => 'user');
    30353035      $loghash{entry} = $resultstr;
    3036       _log($dbh, %loghash);
     3036      $self->_log(%loghash);
    30373037
    30383038      $dbh->commit;
    … …  
    31303130    $dbh->do("INSERT INTO locations (location, group_id, iplist, description, comments) VALUES (?,?,?,?,?)",
    31313131        undef, ($loc, $grp, $iplist, $shdesc, $comments) );
    3132     _log($dbh, entry => "Added location ($shdesc, '$iplist')");
     3132    $self->_log(entry => "Added location ($shdesc, '$iplist')");
    31333133    $dbh->commit;
    31343134  };
    … …  
    31383138    if ($config{log_failures}) {
    31393139      $shdesc = $loc if !$shdesc;
    3140       _log($dbh, (entry => "Failed adding location ($shdesc, '$iplist'): $msg"));
     3140      $self->_log(entry => "Failed adding location ($shdesc, '$iplist'): $msg");
    31413141      $dbh->commit;
    31423142    }
    … …  
    31773177    $dbh->do("UPDATE locations SET group_id=?,iplist=?,description=?,comments=? WHERE location=?",
    31783178        undef, ($grp, $iplist, $shdesc, $comments, $loc) );
    3179     _log($dbh, entry => $okmsg);
     3179    $self->_log(entry => $okmsg);
    31803180    $dbh->commit;
    31813181  };
    … …  
    31853185    if ($config{log_failures}) {
    31863186      $shdesc = $loc if !$shdesc;
    3187       _log($dbh, (entry => "Failed updating location ($shdesc, '$iplist'): $msg"));
     3187      $self->_log(entry => "Failed updating location ($shdesc, '$iplist'): $msg");
    31883188      $dbh->commit;
    31893189    }
    … …  
    32163216    die "Records still exist in location $olddesc\n" if $r;
    32173217    $dbh->do("DELETE FROM locations WHERE location=?", undef, ($loc) );
    3218     _log($dbh, entry => $okmsg);
     3218    $self->_log(entry => $okmsg);
    32193219    $dbh->commit;
    32203220  };
    … …  
    32233223    eval { $dbh->rollback; };
    32243224    if ($config{log_failures}) {
    3225       _log($dbh, (entry => "Failed to delete location ($olddesc, '$oldloc->{iplist}'): $msg"));
     3225      $self->_log(entry => "Failed to delete location ($olddesc, '$oldloc->{iplist}'): $msg");
    32263226      $dbh->commit;
    32273227    }
    … …  
    34183418
    34193419    $logdata{entry} = $msg;
    3420     _log($dbh, %logdata);
     3420    $self->_log(%logdata);
    34213421
    34223422    $dbh->commit;
    … …  
    34283428        "SOA record for $parname: $msg";
    34293429    if ($config{log_failures}) {
    3430       _log($dbh, %logdata);
     3430      $self->_log(%logdata);
    34313431      $dbh->commit;
    34323432    }
    … …  
    36833683    $dbh->do("INSERT INTO "._rectable($defrec, $revrec)." ($fields) VALUES ($vallen)",
    36843684        undef, @vallist);
    3685     _log($dbh, %logdata);
     3685    $self->_log(%logdata);
    36863686    $dbh->commit;
    36873687  };
    … …  
    36923692      $logdata{entry} = "Failed adding ".($defrec eq 'y' ? 'default ' : '').
    36933693        "record '$$host $typemap{$$rectype} $$val', TTL $ttl ($msg)";
    3694       _log($dbh, %logdata);
     3694      $self->_log(%logdata);
    36953695      $dbh->commit;
    36963696    }
    … …  
    38633863  eval {
    38643864    $dbh->do("UPDATE "._rectable($defrec,$revrec)." SET $fields WHERE record_id=?", undef, (@vallist, $id) );
    3865     _log($dbh, %logdata);
     3865    $self->_log(%logdata);
    38663866    $dbh->commit;
    38673867  };
    … …  
    38723872      $logdata{entry} = "Failed updating ".($defrec eq 'y' ? 'default ' : '').
    38733873        "record '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
    3874       _log($dbh, %logdata);
     3874      $self->_log(%logdata);
    38753875      $dbh->commit;
    38763876    }
    … …  
    39743974  eval {
    39753975    my $sth = $dbh->do("DELETE FROM "._rectable($defrec,$revrec)." WHERE record_id=?", undef, ($id));
    3976     _log($dbh, %logdata);
     3976    $self->_log(%logdata);
    39773977    $dbh->commit;
    39783978  };
    … …  
    39833983      $logdata{entry} = "Error deleting ".($defrec eq 'y' ? 'default record' : 'record').
    39843984        " '$oldrec->{host} $typemap{$oldrec->{type}} $oldrec->{val}', TTL $oldrec->{ttl} ($msg)";
    3985       _log($dbh, %logdata);
     3985      $self->_log(%logdata);
    39863986      $dbh->commit;
    39873987    }
    … …  
    43044304      $loghash{group_id} = $self->parentID(id => $id, type => ($revrec eq 'n' ? 'domain' : 'revzone'), revrec => $revrec);
    43054305      $loghash{entry} = $resultstr;
    4306       _log($dbh, %loghash);
     4306      $self->_log(%loghash);
    43074307
    43084308      $dbh->commit;
    … …  
    44714471      ($zone_id) = $dbh->selectrow_array("SELECT currval('domains_domain_id_seq')");
    44724472      $domain_id = $zone_id;
    4473       _log($dbh, (group_id => $group, domain_id => $domain_id,
    4474                 entry => "[Added ".($status ? 'active' : 'inactive')." domain $zone via AXFR]") );
     4473      $self->_log(group_id => $group, domain_id => $domain_id,
     4474                entry => "[Added ".($args{status} ? 'active' : 'inactive')." domain $zone via AXFR]");
    44754475    } else {
    44764476##fixme:  serial
    … …  
    44804480      ($zone_id) = $dbh->selectrow_array("SELECT currval('revzones_rdns_id_seq')");
    44814481      $rdns_id = $zone_id;
    4482       _log($dbh, (group_id => $group, rdns_id => $rdns_id,
    4483                 entry => "[Added ".($status ? 'active' : 'inactive')." reverse zone $cidr via AXFR]") );
     4482      $self->_log(group_id => $group, rdns_id => $rdns_id,
     4483                entry => "[Added ".($args{status} ? 'active' : 'inactive')." reverse zone $cidr via AXFR]");
    44844484    }
    44854485
    … …  
    46494649                ($domain_id, $ettl, $etype, $erid));
    46504650            $nrecs++;
    4651             _log($dbh, (group_id => $group, domain_id => $domain_id, rdns_id => $erdns, entry => $logentry) );
     4651            $self->_log(group_id => $group, domain_id => $domain_id, rdns_id => $erdns, entry => $logentry);
    46524652            next;       # while axfr_next
    46534653          }
    … …  
    46714671                ($rdns_id, $ettl, $etype, $erid));
    46724672            $nrecs++;
    4673             _log($dbh, (group_id => $group, domain_id => $domid, rdns_id => $rdns_id, entry => $logentry) );
     4673            $self->_log(group_id => $group, domain_id => $domid, rdns_id => $rdns_id, entry => $logentry);
    46744674            next;       # while axfr_next
    46754675          }
    … …  
    46984698        $logentry .= " $val', TTL $ttl";
    46994699      }
    4700       _log($dbh, (group_id => $group, domain_id => $domain_id, rdns_id => $rdns_id, entry => $logentry) );
     4700      $self->_log(group_id => $group, domain_id => $domain_id, rdns_id => $rdns_id, entry => $logentry);
    47014701
    47024702    } # while axfr_next
Note: See TracChangeset for help on using the changeset viewer.