* [PATCH 1/2] daemon: avoid polluting the main package
2016-03-03 9:32 5% [PATCH 0/2] daemon updates Eric Wong
@ 2016-03-03 9:32 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2016-03-03 9:32 UTC (permalink / raw)
To: meta
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 <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 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
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] daemon updates
@ 2016-03-03 9:32 5% Eric Wong
2016-03-03 9:32 7% ` [PATCH 1/2] daemon: avoid polluting the main package Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2016-03-03 9:32 UTC (permalink / raw)
To: meta
Preparation work for Unix socket listeners.
Eric Wong (2):
daemon: avoid polluting the main package
daemon: introduce host_with_port for identifying sockets
lib/PublicInbox/Daemon.pm | 31 ++++++++++++++++---------------
lib/PublicInbox/HTTP.pm | 8 +++++---
script/public-inbox-httpd | 14 +++-----------
script/public-inbox-nntpd | 2 +-
t/httpd-corner.psgi | 3 +++
t/httpd-corner.t | 10 ++++++++++
6 files changed, 38 insertions(+), 30 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-03-03 9:32 5% [PATCH 0/2] daemon updates Eric Wong
2016-03-03 9:32 7% ` [PATCH 1/2] daemon: avoid polluting the main package Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).