From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, RP_MATCHES_RCVD,URIBL_BLOCKED shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 7A01D63381F for ; Thu, 3 Mar 2016 09:32:35 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] daemon: avoid polluting the main package Date: Thu, 3 Mar 2016 09:32:28 +0000 Message-Id: <20160303093229.27701-2-e@80x24.org> In-Reply-To: <20160303093229.27701-1-e@80x24.org> References: <20160303093229.27701-1-e@80x24.org> List-Id: 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. --- lib/PublicInbox/Daemon.pm | 6 ++---- script/public-inbox-httpd | 2 +- script/public-inbox-nntpd | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/PublicInbox/Daemon.pm b/lib/PublicInbox/Daemon.pm index 45c1563..77ab2a7 100644 --- a/lib/PublicInbox/Daemon.pm +++ b/lib/PublicInbox/Daemon.pm @@ -1,10 +1,8 @@ # Copyright (C) 2015 all contributors # 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 2157962..d867b47 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 23d269d..cea8816 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 -- EW