Changeset 25 for trunk/dnsbl/DNSBL.pm

Timestamp:

09/03/10 15:18:51 (14 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Changes across the board to support multi-instance without code changes.
DB config is now loaded from a fragment in /etc/dnsbl, and the DB in turn
contains the autolist thresholds and some visual sugar for the web
interface so you know which DB you're dealing with.

File:

• trunk/dnsbl/DNSBL.pm (modified) (2 diffs)

trunk/dnsbl/DNSBL.pm

@@ -100 +100 @@
 sub DESTROY {
   my $self = shift;
-  $self->dbclose();
+  $self->dbclose() if $dbh;
 }
 
@@ -112 +112 @@
 
 sub connect {
-  my $DSN = "DBI:Pg:host=dbhost;dbname=dnsbl";
-#  my $DSN = "DBI:Pg:dbname=dnsbl";
-  my $user = "dnsbl";
-  my $pass = "spambgone";
+  my $self = shift;
+  my $dbhost = shift;
+  my $dbname = shift;
+  my $dbuser = shift;
+  my $dbpass = shift;
   ## want to NOT autocommit everything, it's unlikely we'll step on our own toes but...
-  $dbh = DBI->connect($DSN, $user, $pass, {
+  $dbh = DBI->connect("DBI:Pg:host=$dbhost;dbname=$dbname", $dbuser, $dbpass, {
         AutoCommit => 0,
         PrintError => 1