about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2016-03-03 05:14:30 +0000
committerEric Wong <e@80x24.org>2016-03-03 09:19:05 +0000
commitb8e30717b529d6461190b54efa8c6402197cdd4e (patch)
treea111e85337f3aee4ddc9adafb7b9fd0cbfd8ea1a
parent5cddfa50765d59157e15488c235fe01202db0972 (diff)
downloadpublic-inbox-b8e30717b529d6461190b54efa8c6402197cdd4e.tar.gz
We've distilled the daemon code into one public function ("run"),
so avoid polluting the main namespace and just have users
prefix with the full package name for this rarely-used class.
-rw-r--r--lib/PublicInbox/Daemon.pm6
-rwxr-xr-xscript/public-inbox-httpd2
-rwxr-xr-xscript/public-inbox-nntpd2
3 files changed, 4 insertions, 6 deletions
diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm
index 45c15634..77ab2a71 100644
--- a/lib/PublicInbox/Daemon.pm
+++ b/lib/PublicInbox/Daemon.pm
@@ -1,10 +1,8 @@
 # Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: AGPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
-package PublicInbox::Daemon; # empty class :p
-
 # contains common daemon code for the nntpd and httpd servers.
 # This may be used for read-only IMAP server if we decide to implement it.
-package main;
+package PublicInbox::Daemon;
 use strict;
 use warnings;
 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
@@ -383,7 +381,7 @@ sub daemon_loop ($$) {
 }
 
 
-sub daemon_run ($$$) {
+sub run ($$$) {
         my ($default, $refresh, $post_accept) = @_;
         daemon_prepare($default);
         daemonize();
diff --git a/script/public-inbox-httpd b/script/public-inbox-httpd
index 21579622..d867b477 100755
--- a/script/public-inbox-httpd
+++ b/script/public-inbox-httpd
@@ -49,7 +49,7 @@ my $refresh = sub {
         }
 };
 
-daemon_run('0.0.0.0:8080', $refresh,
+PublicInbox::Daemon::run('0.0.0.0:8080', $refresh,
         sub ($$$) { # post_accept
                 my ($client, $addr, $srv) = @_;
                 my $fd = fileno($srv);
diff --git a/script/public-inbox-nntpd b/script/public-inbox-nntpd
index 23d269d4..cea88163 100755
--- a/script/public-inbox-nntpd
+++ b/script/public-inbox-nntpd
@@ -10,7 +10,7 @@ require PublicInbox::NewsGroup;
 require PublicInbox::NNTP;
 require PublicInbox::Config;
 my $nntpd = PublicInbox::NNTPD->new;
-daemon_run('0.0.0.0:119',
+PublicInbox::Daemon::run('0.0.0.0:119',
         sub { $nntpd->refresh_groups }, # refresh
         sub ($$$) { PublicInbox::NNTP->new($_[0], $nntpd) }); # post_accept