about summary refs log tree commit homepage
path: root/script
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-05-14 06:10:36 +0000
committerEric Wong <e@80x24.org>2016-05-16 02:55:58 +0000
commit48b21cb662c1e17b7219612bff6ea14b98c85221 (patch)
tree1f5b29c80c52dea26f1a9f33fae9cbe515e3debf /script
parent56008dad820a47fe70d2d69a51248ff1b87beabf (diff)
downloadpublic-inbox-48b21cb662c1e17b7219612bff6ea14b98c85221.tar.gz
From the beginning, we've avoided objects here in favor
of faster startup time; but it may not be worth it
since a persistent httpd/nntpd is faster and -mda
isn't hit as often.
Diffstat (limited to 'script')
-rwxr-xr-xscript/public-inbox-init4
-rwxr-xr-xscript/public-inbox-mda4
2 files changed, 4 insertions, 4 deletions
diff --git a/script/public-inbox-init b/script/public-inbox-init
index ca0f9ddf..54d6ce4c 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -43,10 +43,10 @@ if (-e $pi_config) {
         foreach my $addr (@address) {
                 my $found = $cfg->lookup($addr);
                 if ($found) {
-                        if ($found->{inbox} ne $name) {
+                        if ($found->{name} ne $name) {
                                 print STDERR
                                         "`$addr' already defined for ",
-                                        "`$found->{inbox}',\n",
+                                        "`$found->{name}',\n",
                                         "does not match intend `$name'\n";
                                 $conflict = 1;
                         } else {
diff --git a/script/public-inbox-mda b/script/public-inbox-mda
index 8e224a50..b606c59a 100755
--- a/script/public-inbox-mda
+++ b/script/public-inbox-mda
@@ -49,7 +49,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
         } elsif ($fcfg eq 'scrub') {
                 $filter_arg = undef; # the default for legacy versions
         } else {
-                warn "publicinbox.$dst->{inbox}.filter=$fcfg invalid\n";
+                warn "publicinbox.$dst->{name}.filter=$fcfg invalid\n";
                 warn "must be either 'scrub' or 'reject' (the default)\n";
         }
 
@@ -65,7 +65,7 @@ if (PublicInbox::MDA->precheck($filter, $dst->{address}) &&
                         };
                         my $git = PublicInbox::Git->new($main_repo);
                         my $im = PublicInbox::Import->new($git,
-                                                $dst->{inbox}, $recipient);
+                                                $dst->{name}, $recipient);
                         if (defined $im->add($msg)) {
                                 $im->done;
                                 $filter->ignore; # exits